[gnome-utils] 2.91.6

Wed Feb 2 22:38:31 UTC 2011

commit 29c2a9466e1b19af697c62955ce3f3c408fcd0bb
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Feb 2 17:38:16 2011 -0500

    2.91.6

 gnome-utils.spec |   94 ++++++++++-------------------------------------------
 1 files changed, 18 insertions(+), 76 deletions(-)
---

diff --git a/gnome-utils.spec b/gnome-utils.spec
index d5ae1f5..5533d4e 100644
--- a/gnome-utils.spec
+++ b/gnome-utils.spec
@@ -1,5 +1,3 @@
-%define glib2_version 2.13.3
-%define gtk2_version 2.10.0
 %define desktop_file_utils_version 0.9
 %define gnome_doc_utils_version 0.3.2
 %define libgnome_version 2.13.7
@@ -8,7 +6,7 @@
 %define gnome_panel_version 2.9.4
 
 Name:           gnome-utils
-Version:        2.31.1
+Version:        2.91.3
 Release:        2%{?dist}
 Epoch:          1
 Summary:        GNOME utility programs
@@ -17,7 +15,7 @@ Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-utils
-Source0:        http://download.gnome.org/sources/gnome-utils/2.31/gnome-utils-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gnome-utils/2.91/gnome-utils-%{version}.tar.bz2
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=597435
 Patch2:      selfshot.patch
@@ -25,8 +23,8 @@ Patch2:      selfshot.patch
 Patch3:      gnome-utils-linking.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires:  glib2-devel >= %{glib2_version}
-BuildRequires:  gtk2-devel >= %{gtk2_version}
+BuildRequires:  glib2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  gnome-desktop-devel >= %{gnome_desktop_version}
 BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libcanberra-devel
@@ -42,9 +40,6 @@ BuildRequires:  automake autoconf libtool
 BuildRequires:  scrollkeeper
 
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(post): GConf2 >= 2.14
-Requires(preun): GConf2 >= 2.14
-Requires(pre): GConf2 >= 2.14
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 # obsolete the standalone baobab package from Extras
@@ -60,8 +55,6 @@ a screenshot tool and others.
 Summary: Development files for gnome-utils
 Group: Development/Libraries
 Requires:  gnome-utils = %{epoch}:%{version}-%{release}
-Requires:  glib2-devel >= %{glib2_version}
-Requires:  gtk2-devel >= %{gtk2_version}
 
 %description devel
 The gnome-utils-devel package contains header files and other resources
@@ -86,39 +79,15 @@ view various system log files.
 
 %prep
 %setup -q
-%patch2 -p1 -b .selfshot
-%patch3 -p1 -b .linking
-
-# Hide from menus
-pushd gsearchtool
-rm gnome-search-tool.desktop
-echo "NoDisplay=true" >> gnome-search-tool.desktop.in
-popd
-
-autoreconf -f -i
 
 %build
 %configure --disable-scrollkeeper --enable-console-helper
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 make %{?_smp_mflags}
 
-# strip unneeded translations from .mo files
-# ideally intltool (ha!) would do that for us
-# http://bugzilla.gnome.org/show_bug.cgi?id=474987
-cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
-mv POTFILES.keep POTFILES.in
-intltool-update --pot
-for p in *.po; do
-  msgmerge $p gnome-utils-2.0.pot > $p.out
-  msgfmt -o `basename $p .po`.gmo $p.out
-done
-
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -160,23 +129,6 @@ desktop-file-install --vendor gnome --delete-original       \
   --add-category=Utility                \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-dictionary.desktop
 
-# save space by linking identical images in translated docs
-for n in baobab gnome-dictionary gnome-search-tool gnome-system-log; do
-  helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/$n
-  for f in $helpdir/C/figures/*.png; do
-    for d in $helpdir/*; do
-      if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
-        g="$d/figures/$b"
-        if [ -f "$g" ]; then
-          if cmp -s $f $g; then
-            rm "$g"; ln -s "../../C/figures/$b" "$g"
-          fi
-        fi
-      fi
-    done
-  done
-done
-
 %find_lang gnome-utils-2.0
 %find_lang baobab --with-gnome
 %find_lang gnome-dictionary --with-gnome
@@ -231,24 +183,6 @@ fi
 %posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 
-%post -n gnome-system-log
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-   %{_sysconfdir}/gconf/schemas/gnome-system-log.schemas \
-      >& /dev/null || :
-
-%pre -n gnome-system-log
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-system-log.schemas >& /dev/null || :
-fi
-
-%preun -n gnome-system-log
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnome-system-log.schemas >& /dev/null || :
-fi
-
 
 %files -f gnome-utils-2.0.lang
 %defattr(-,root,root,-)
@@ -258,15 +192,22 @@ fi
 %doc gsearchtool/AUTHORS
 %doc baobab/AUTHORS
 %doc baobab/README
-%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
-%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
-%{_sysconfdir}/gconf/schemas/baobab.schemas
 %{_bindir}/gnome-dictionary
 %{_bindir}/gnome-panel-screenshot
 %{_bindir}/gnome-screenshot
 %{_bindir}/gnome-search-tool
 %{_bindir}/baobab
+%{_bindir}/gnome-font-viewer
+%{_bindir}/gnome-thumbnail-font
+%{_datadir}/GConf/gsettings/gnome-screenshot.convert
+%{_datadir}/GConf/gsettings/logview.convert
+%{_datadir}/applications/gnome-font-viewer.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.baobab.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-screenshot.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-system-log.gschema.xml
+%{_datadir}/thumbnailers/gnome-font-viewer.thumbnailer
 %{_datadir}/applications/gnome-dictionary.desktop
 %{_datadir}/applications/gnome-screenshot.desktop
 %{_datadir}/applications/gnome-search-tool.desktop
@@ -278,9 +219,7 @@ fi
 %{_datadir}/pixmaps/gsearchtool/
 %{_datadir}/icons/hicolor/24x24/apps/baobab.png
 %{_datadir}/icons/hicolor/scalable/apps/baobab.svg
-%{_libexecdir}/gnome-dictionary-applet
 %{_datadir}/gnome-2.0/ui/GNOME_DictionaryApplet.xml
-%{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server
 %{_mandir}/man1/gnome-dictionary.1.gz
 %{_mandir}/man1/gnome-search-tool.1.gz
 %{_mandir}/man1/baobab.1.gz
@@ -302,13 +241,16 @@ fi
 %{_bindir}/gnome-system-log
 %{_sbindir}/gnome-system-log
 %{_datadir}/gnome-utils/
-%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas
 %{_sysconfdir}/security/console.apps/gnome-system-log
 %{_sysconfdir}/pam.d/gnome-system-log
 %{_datadir}/applications/gnome-system-log.desktop
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Wed Feb  2 2011 Matthias Clasen <mclasen at redhat.com> - 1:2.91.3-1
+- Update to 2.91.3
+- Drop space-saving hack
+
 * Thu Aug  5 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.31.1-1
 - Update to 2.31.1
 
