packages: gnome-utils/gnome-utils.spec - updated to 3.0.0; merged from DEVEL

megabajt megabajt at pld-linux.org
Thu Apr 7 11:14:31 CEST 2011 

Author: megabajt                     Date: Thu Apr  7 09:14:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL

---- Files affected:
packages/gnome-utils:
   gnome-utils.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: packages/gnome-utils/gnome-utils.spec
diff -u packages/gnome-utils/gnome-utils.spec:1.176 packages/gnome-utils/gnome-utils.spec:1.177
--- packages/gnome-utils/gnome-utils.spec:1.176	Fri Feb  4 19:23:53 2011
+++ packages/gnome-utils/gnome-utils.spec	Thu Apr  7 11:14:26 2011
@@ -6,30 +6,30 @@
 Summary(uk.UTF-8):	Утиліти GNOME
 Summary(zh_CN.UTF-8):	GNOME应用程序集
 Name:		gnome-utils
-Version:	2.32.0
-Release:	2
+Version:	3.0.0
+Release:	1
 Epoch:		1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	e150cdb53314fe97ea80768850c2e03c
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	a0d07b3b045caba13518bf25f7973745
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.26.0
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	bison
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.20.0
+BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gnome-common >= 2.24.0
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-panel-devel >= 2.26.0
-BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	gsettings-desktop-schemas-devel
+BuildRequires:	gtk+3-devel >= 3.0.3
 BuildRequires:	gtk-doc >= 1.10
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libcanberra-gtk-devel >= 0.4
+BuildRequires:	libcanberra-gtk3-devel >= 0.26
 BuildRequires:	libgtop-devel >= 2.14.8
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -39,9 +39,10 @@
 BuildRequires:	zlib-devel
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
+Requires:	gsettings-desktop-schemas
+Requires:	hicolor-icon-theme
 Obsoletes:	gnome
 Obsoletes:	gnome-admin
 Obsoletes:	gnome-utils-floppy
@@ -126,11 +127,11 @@
 Summary:	Graphical directory tree analyzer
 Summary(pl.UTF-8):	Graficzny analizator drzew katalogów
 Group:		X11/Applications
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	hicolor-icon-theme
 Obsoletes:	baobab
 
 %description baobab
@@ -143,10 +144,8 @@
 Summary:	Online dictionary
 Summary(pl.UTF-8):	Słownik online
 Group:		X11/Applications
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
+Requires(post,postun):	glib2 >= 1:2.26.0
 Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	gnome-utils-dict
 Obsoletes:	gnome-dict
@@ -161,13 +160,28 @@
 Pozwala na wyszukiwanie definicji i poprawnej pisowni słów w słowniku
 sieciowym.
 
+%package font-viewer
+Summary:	Font viewer
+Summary(pl.UTF-8):	Przeglądarka czcionek
+Group:		X11/Applications
+Requires(post,postun):	desktop-file-utils
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description font-viewer
+This package provides font viewer.
+
+%description font-viewer -l pl.UTF-8
+Ten pakiet dostarcza przeglądarkę czcionek.
+
 %package logview
 Summary:	System log viewer for GNOME
 Summary(pl.UTF-8):	Przeglądarka logów systemowych dla GNOME
 Group:		X11/Applications
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	hicolor-icon-theme
 Conflicts:	gnome-utils <= 0:2.10.0-1
 
 %description logview
@@ -195,8 +209,7 @@
 Summary:	Screenshot utility
 Summary(pl.UTF-8):	Narzędzie do robienia zrzutów ekranu
 Group:		X11/Applications
-Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
+Requires(post,postun):	glib2 >= 1:2.26.0
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Conflicts:	gnome-utils <= 0:2.10.0-1
 
@@ -209,9 +222,6 @@
 %prep
 %setup -q
 
-sed -i -e 's/^en at shaw//' po/LINGUAS
-rm -f po/en at shaw.po
-
 %build
 %{__intltoolize}
 %{__gnome_doc_common}
@@ -223,6 +233,8 @@
 %configure \
 	--disable-schemas-install \
 	--disable-scrollkeeper \
+	--disable-silent-rules \
+	--enable-static \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
@@ -234,6 +246,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %find_lang %{name}-2.0
 %find_lang baobab --with-gnome --with-omf
 %find_lang gnome-dictionary --with-gnome --with-omf
@@ -248,37 +262,37 @@
 
 %post baobab
 %scrollkeeper_update_post
-%gconf_schema_install baobab.schemas
 %update_icon_cache hicolor
-
-%preun baobab
-%gconf_schema_uninstall baobab.schemas
+%glib_compile_schemas
 
 %postun baobab
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
+%glib_compile_schemas
 
 %post dictionary
 %scrollkeeper_update_post
-%gconf_schema_install gnome-dictionary.schemas
-%update_icon_cache hicolor
-
-%preun dictionary
-%gconf_schema_uninstall gnome-dictionary.schemas
+%glib_compile_schemas
 
 %postun dictionary
 %scrollkeeper_update_postun
-%update_icon_cache hicolor
+%glib_compile_schemas
+
+%post font-viewer
+%update_desktop_database_post
+
+%postun font-viewer
+%update_desktop_database_post
 
 %post logview
 %scrollkeeper_update_post
-%gconf_schema_install gnome-system-log.schemas
-
-%preun logview
-%gconf_schema_uninstall gnome-system-log.schemas
+%glib_compile_schemas
+%update_icon_cache hicolor
 
 %postun logview
+%glib_compile_schemas
 %scrollkeeper_update_postun
+%update_icon_cache hicolor
 
 %post search-tool
 %scrollkeeper_update_post
@@ -291,10 +305,10 @@
 %scrollkeeper_update_postun
 
 %post screenshot
-%gconf_schema_install gnome-screenshot.schemas
+%glib_compile_schemas
 
-%preun screenshot
-%gconf_schema_uninstall gnome-screenshot.schemas
+%postun screenshot
+%glib_compile_schemas
 
 %files -f %{name}-2.0.lang
 %defattr(644,root,root,755)
@@ -310,7 +324,6 @@
 %files -n libgdict-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgdict-1.0.so
-%{_libdir}/libgdict-1.0.la
 %{_includedir}/gdict-1.0
 %{_pkgconfigdir}/gdict-1.0.pc
 
@@ -326,7 +339,7 @@
 %defattr(644,root,root,755)
 %doc baobab/AUTHORS baobab/ChangeLog baobab/README baobab/TODO
 %attr(755,root,root) %{_bindir}/baobab
-%{_sysconfdir}/gconf/schemas/baobab.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
 %{_desktopdir}/baobab.desktop
 %{_iconsdir}/hicolor/*/*/baobab.*
 %{_datadir}/baobab
@@ -336,23 +349,30 @@
 %defattr(644,root,root,755)
 %doc gnome-dictionary/AUTHORS gnome-dictionary/README gnome-dictionary/TODO
 %attr(755,root,root) %{_bindir}/gnome-dictionary
-%attr(755,root,root) %{_libdir}/gnome-dictionary-applet
-%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
 %{_desktopdir}/gnome-dictionary.desktop
-%{_libdir}/bonobo/servers/*
+%{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome-dictionary
 %{_mandir}/man1/gnome-dictionary*
 
+%files font-viewer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gnome-font-viewer
+%attr(755,root,root) %{_bindir}/gnome-thumbnail-font
+%{_desktopdir}/gnome-font-viewer.desktop
+%{_datadir}/thumbnailers/gnome-font-viewer.thumbnailer
+
 %files logview -f gnome-system-log.lang
 %defattr(644,root,root,755)
 %doc logview/ChangeLog logview/TODO
 %attr(755,root,root) %{_bindir}/gnome-system-log
-%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas
 %{_desktopdir}/gnome-system-log.desktop
+%{_datadir}/GConf/gsettings/logview.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-log.gschema.xml
 %{_datadir}/%{name}/logview-filter.ui
 %{_datadir}/%{name}/logview-toolbar.xml
 %{_mandir}/man1/gnome-system-log*
+%{_iconsdir}/hicolor/*/*/logview.png
 
 %files search-tool -f gnome-search-tool.lang
 %defattr(644,root,root,755)
@@ -368,9 +388,10 @@
 %doc gnome-screenshot/ChangeLog
 %attr(755,root,root) %{_bindir}/gnome-panel-screenshot
 %attr(755,root,root) %{_bindir}/gnome-screenshot
+%{_datadir}/GConf/gsettings/gnome-screenshot.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml
 %{_datadir}/gnome-screenshot
 %{_desktopdir}/gnome-screenshot.desktop
-%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_mandir}/man1/gnome-screenshot*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -379,6 +400,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2011/04/07 09:14:26  megabajt
+- updated to 3.0.0; merged from DEVEL
+
+Revision 1.176.2.4  2011/03/26 20:55:13  megabajt
+- updated to 2.91.93
+
+Revision 1.176.2.3  2011/03/21 19:18:43  megabajt
+- removed libtool file from libgdict-devel
+
+Revision 1.176.2.2  2011/03/21 19:17:01  megabajt
+- fixed and sorted deps in subpackages
+
+Revision 1.176.2.1  2011/03/21 19:11:04  megabajt
+- updated to 2.91.91
+
 Revision 1.176  2011/02/04 18:23:53  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-utils/gnome-utils.spec?r1=1.176&r2=1.177&f=u

More information about the pld-cvs-commit mailing list