Author: megabajt Date: Fri May 20 22:14:58 2011 GMT Module: packages Tag: HEAD ---- Log message: - removed gtkhtml support and disabled gecko (requires gtkhtml for printing) - packaged all files - release 3
---- Files affected: packages/mono-tools: mono-tools.spec (1.51 -> 1.52) , mono-tools-configure.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mono-tools/mono-tools.spec diff -u packages/mono-tools/mono-tools.spec:1.51 packages/mono-tools/mono-tools.spec:1.52 --- packages/mono-tools/mono-tools.spec:1.51 Thu Feb 17 13:45:24 2011 +++ packages/mono-tools/mono-tools.spec Sat May 21 00:14:53 2011 @@ -1,20 +1,21 @@ # $Revision$, $Date$ # # Conditional build: -%bcond_without gecko # don't build gecko html renderer +%bcond_with gecko # don't build gecko html renderer # %include /usr/lib/rpm/macros.mono Summary: Mono Tools Summary(pl.UTF-8): Narzędzia do mono Name: mono-tools Version: 2.10 -Release: 2 +Release: 3 License: GPL v2+ Group: Development/Tools # latest downloads summary at http://ftp.novell.com/pub/mono/sources-stable/ Source0: http://ftp.novell.com/pub/mono/sources/mono-tools/%{name}-%{version}.tar.bz2 # Source0-md5: da178df2c119c696c08c09dc9eb01994 Patch0: %{name}-pwd.patch +Patch1: %{name}-configure.patch URL: http://www.mono-project.com/ BuildRequires: autoconf BuildRequires: automake @@ -33,8 +34,10 @@ BuildRequires: pkgconfig BuildRequires: rpmbuild(monoautodeps) BuildRequires: sed >= 4.0 +Requires: hicolor-icon-theme Requires: mono >= 2.10 Requires: mono-tools-html-renderer +Obsoletes: mono-tools-gtkhtml ExcludeArch: i386 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -85,19 +88,6 @@ %description monowebbrowser -l pl.UTF-8 Oparty na Mono.WebBrowser wyświetlacz HTML-a dla monodoc. -%package gtkhtml -Summary: GtkHTML based monodoc HTML renderer -Summary(pl.UTF-8): Oparty na GtkHTML wyświetlacz HTML-a dla monodoc -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Provides: mono-tools-html-renderer - -%description gtkhtml -GtkHTML based monodoc HTML renderer. - -%description gtkhtml -l pl.UTF-8 -Oparty na GtkHTML wyświetlacz HTML-a dla monodoc. - %package gendarme Summary: A tool to find problems in .NET applications and libraries Summary(pl.UTF-8): Narzędzie znajdujące problemy w aplikacjach i bibliotekach .NET @@ -162,6 +152,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # as expected by ilcontrast script %{__sed} -i -e 's,\$(libdir)/ilcontrast,$(prefix)/lib/ilcontrast,' ilcontrast/Makefile.am @@ -189,6 +180,12 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +%update_icon_cache hicolor + +%postun +%update_icon_cache hicolor + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog README @@ -196,6 +193,7 @@ %attr(755,root,root) %{_bindir}/emveepee %attr(755,root,root) %{_bindir}/gasnview %attr(755,root,root) %{_bindir}/gsharp +%attr(755,root,root) %{_bindir}/ilcontrast %attr(755,root,root) %{_bindir}/minvoke %attr(755,root,root) %{_bindir}/monodoc %attr(755,root,root) %{_bindir}/mperfmon @@ -204,6 +202,8 @@ %{_prefix}/lib/gsharp/gsharp.exe.config %attr(755,root,root) %{_prefix}/lib/mono/2.0/gasnview.exe %{_prefix}/lib/create-native-map +%dir %{_prefix}/lib/ilcontrast +%attr(755,root,root) %{_prefix}/lib/ilcontrast/ilcontrast.exe %dir %{_prefix}/lib/minvoke %attr(755,root,root) %{_prefix}/lib/minvoke/minvoke.exe %dir %{_prefix}/lib/mperfmon @@ -217,8 +217,11 @@ %attr(755,root,root) %{_prefix}/lib/monodoc/browser.exe %{_prefix}/lib/monodoc/web %{_desktopdir}/gsharp.desktop +%{_desktopdir}/ilcontrast.desktop %{_desktopdir}/monodoc.desktop +%{_pixmapsdir}/ilcontrast.png %{_pixmapsdir}/monodoc.png +%{_iconsdir}/hicolor/*/*/*.png %{_pkgconfigdir}/create-native-map.pc %{_mandir}/man1/create-native-map.1* %{_mandir}/man1/mperfmon.1* @@ -241,10 +244,6 @@ %defattr(644,root,root,755) %{_prefix}/lib/monodoc/MonoWebBrowserHtmlRender.dll -%files gtkhtml -%defattr(644,root,root,755) -%{_prefix}/lib/monodoc/GtkHtmlHtmlRender.dll - %files gendarme %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gd2i @@ -285,6 +284,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.52 2011/05/20 22:14:53 megabajt +- removed gtkhtml support and disabled gecko (requires gtkhtml for printing) +- packaged all files +- release 3 + Revision 1.51 2011/02/17 12:45:24 lisu - fix install - rel 2 ================================================================ Index: packages/mono-tools/mono-tools-configure.patch diff -u /dev/null packages/mono-tools/mono-tools-configure.patch:1.1 --- /dev/null Sat May 21 00:14:58 2011 +++ packages/mono-tools/mono-tools-configure.patch Sat May 21 00:14:53 2011 @@ -0,0 +1,30 @@ +--- mono-tools-2.10/configure.in.orig 2011-05-20 23:33:52.523488704 +0200 ++++ mono-tools-2.10/configure.in 2011-05-20 23:34:59.173127631 +0200 +@@ -62,27 +62,12 @@ fi + AC_SUBST(GNOME_SHARP_LIBS) + AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") + +-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) +-if test "x$enable_gtkhtml" = "xyes"; then +- CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14 $CSHARP_FLAGS" +-else +- PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no) +-fi +-AC_SUBST(GTKHTML_SHARP_LIBS) + AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") + + AC_SUBST(CSHARP_FLAGS) + +-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no) +-AC_SUBST(GECKO_SHARP_LIBS) + AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") + +-if test "x$enable_gecko" = "xyes"; then +- # get the mozilla home directory +- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" +- AC_SUBST(MOZILLA_HOME) +-fi +- + PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no) + AC_SUBST(WEBKIT_SHARP_LIBS) + AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes") ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mono-tools/mono-tools.spec?r1=1.51&r2=1.52&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
