rpms/system-config-services/devel .cvsignore, 1.39, 1.40 sources, 1.49, 1.50 system-config-services.spec, 1.50, 1.51

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-services/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15367

Modified Files:
	.cvsignore sources system-config-services.spec 
Log Message:
Merge review (#226470):
- remove hicolor-icon-theme, gtk2 requirements, call gtk-update-icon-cache with full path



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Oct 2007 09:27:37 -0000	1.39
+++ .cvsignore	15 Oct 2007 13:49:02 -0000	1.40
@@ -1 +1 @@
-system-config-services-0.9.14.tar.bz2
+system-config-services-0.9.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	15 Oct 2007 09:27:37 -0000	1.49
+++ sources	15 Oct 2007 13:49:02 -0000	1.50
@@ -1 +1 @@
-ff6ce0af304ac40b4dc850d233d49d1b  system-config-services-0.9.14.tar.bz2
+56260c276927d9c9cdc013b3520a6c8b  system-config-services-0.9.15.tar.bz2


Index: system-config-services.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-services/devel/system-config-services.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- system-config-services.spec	15 Oct 2007 09:27:37 -0000	1.50
+++ system-config-services.spec	15 Oct 2007 13:49:02 -0000	1.51
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: system-config-services is an initscript and xinetd configuration utility
 Name: system-config-services
-Version: 0.9.14
+Version: 0.9.15
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/services
 # We are upstream, thus the source is only available from within this source
@@ -23,10 +23,6 @@
 Requires: htmlview
 %endif
 Requires: python >= 2.3.0
-Requires(post): hicolor-icon-theme
-Requires(post): gtk2
-Requires(postun): hicolor-icon-theme
-Requires(postun): gtk2
 BuildRequires: intltool
 BuildRequires: sed
 BuildRequires: desktop-file-utils
@@ -58,14 +54,14 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
 %clean
@@ -87,6 +83,11 @@
 %{_mandir}/*/system-config-services.8*
 
 %changelog
+* Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.15-1
+- Merge review (#226470):
+  - remove hicolor-icon-theme, gtk2 requirements, call gtk-update-icon-cache
+    with full path
+
 * Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> - 0.9.14-1
 - Merge review (#226470):
   - remove shebang line from nonblockingreader.py