rpms/gnome-utils/devel gnome-utils.spec,1.195,1.196

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6597

Modified Files:
	gnome-utils.spec 
Log Message:
Split off a gnome-system-log subpackage



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- gnome-utils.spec	25 Jul 2009 00:50:12 -0000	1.195
+++ gnome-utils.spec	30 Jul 2009 04:54:38 -0000	1.196
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.27.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -67,6 +67,15 @@ The gnome-utils-devel package contains h
 needed to develop programs using the libraries contained in gnome-utils.
 
 
+%package -n gnome-system-log
+Summary: A log file viewer for the GNOME desktop
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description -n gnome-system-log
+The gnome-system-log package contains an application that lets you
+view various system log files.
+
 %prep
 %setup -q
 
@@ -137,6 +146,12 @@ desktop-file-install --vendor gnome --de
   --copy-generic-name-to-name				    \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-baobab.desktop
 
+desktop-file-install --vendor gnome --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  --remove-category=Office 				    \
+  --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
@@ -155,8 +170,15 @@ for n in baobab gnome-dictionary gnome-s
   done
 done
 
-%find_lang gnome-utils-2.0 --all-name --with-gnome
-
+%find_lang gnome-utils-2.0
+%find_lang baobab --with-gnome
+%find_lang gnome-dictionary --with-gnome
+%find_lang gnome-search-tool --with-gnome
+%find_lang gnome-system-log --with-gnome
+
+cat baobab.lang >> gnome-utils-2.0.lang
+cat gnome-dictionary.lang >> gnome-utils-2.0.lang
+cat gnome-search-tool.lang >> gnome-utils-2.0.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -169,7 +191,6 @@ update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
-	%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas \
 	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
 	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
 	%{_sysconfdir}/gconf/schemas/baobab.schemas \
@@ -209,6 +230,26 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
 fi
 
 
+%post -n gnome-system-log
+scrollkeeper-update -q
+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,-)
 %doc COPYING NEWS README
@@ -217,30 +258,23 @@ fi
 %doc gsearchtool/AUTHORS
 %doc baobab/AUTHORS
 %doc baobab/README
-%{_sysconfdir}/security/console.apps/gnome-system-log
-%{_sysconfdir}/pam.d/gnome-system-log
 %{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas
 %{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas
 %{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas
-%{_sysconfdir}/gconf/schemas/gnome-system-log.schemas
 %{_sysconfdir}/gconf/schemas/baobab.schemas
 %{_bindir}/gnome-dictionary
 %{_bindir}/gnome-panel-screenshot
 %{_bindir}/gnome-screenshot
 %{_bindir}/gnome-search-tool
 %{_bindir}/baobab
-%{_bindir}/gnome-system-log
-%{_sbindir}/gnome-system-log
 %{_datadir}/applications/gnome-dictionary.desktop
 %{_datadir}/applications/gnome-screenshot.desktop
 %{_datadir}/applications/gnome-search-tool.desktop
-%{_datadir}/applications/gnome-system-log.desktop
 %{_datadir}/applications/gnome-baobab.desktop
 %{_datadir}/gdict-1.0/
 %{_datadir}/gnome-dictionary/
 %{_datadir}/gnome-screenshot/
 %{_datadir}/baobab/
-%{_datadir}/gnome-utils/
 %{_datadir}/pixmaps/gsearchtool/
 %{_datadir}/icons/hicolor/24x24/apps/baobab.png
 %{_datadir}/icons/hicolor/scalable/apps/baobab.svg
@@ -250,7 +284,6 @@ fi
 %{_libdir}/libgdict-1.0.so.*
 %{_mandir}/man1/gnome-dictionary.1.gz
 %{_mandir}/man1/gnome-search-tool.1.gz
-%{_mandir}/man1/gnome-system-log.1.gz
 %{_mandir}/man1/baobab.1.gz
 
 %files devel
@@ -259,8 +292,21 @@ fi
 %{_includedir}/gdict-1.0/
 %{_datadir}/gtk-doc/html/gdict/
 
+%files -n gnome-system-log -f gnome-system-log.lang
+%{_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
+* Thu Jul 30 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.27.2-4
+- Split off a gnome-system-log subpackage
+- Move gnome-dictionary to a better place in the menus
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.27.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild