rpms/system-config-samba/devel .cvsignore, 1.49, 1.50 sources, 1.51, 1.52 system-config-samba.spec, 1.54, 1.55

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
Merge review (#226468):
- remove "ExclusiveOS: Linux"
- remove hicolor-icon-theme requirement, call gtk-update-icon-cache with full path



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	12 Oct 2007 08:42:36 -0000	1.49
+++ .cvsignore	15 Oct 2007 09:14:38 -0000	1.50
@@ -1 +1 @@
-system-config-samba-1.2.55.tar.bz2
+system-config-samba-1.2.56.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	12 Oct 2007 09:13:19 -0000	1.51
+++ sources	15 Oct 2007 09:14:38 -0000	1.52
@@ -1 +1 @@
-9918efb8208d80c0401948472fa666ee  system-config-samba-1.2.55.tar.bz2
+c91e38a742e012aa55f0eb8f8436ec58  system-config-samba-1.2.56.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- system-config-samba.spec	12 Oct 2007 08:42:36 -0000	1.54
+++ system-config-samba.spec	15 Oct 2007 09:14:38 -0000	1.55
@@ -1,10 +1,9 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.55
+Version: 1.2.56
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPLv2+
-ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildArch: noarch
@@ -31,8 +30,6 @@
 %else
 Requires: htmlview
 %endif
-Requires(post): hicolor-icon-theme
-Requires(postun): hicolor-icon-theme
 
 %description
 system-config-samba is a graphical user interface for creating, 
@@ -62,14 +59,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
 
 %files -f %{name}.lang
@@ -84,8 +81,14 @@
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-samba
 
 %changelog
+* Mon Oct 15 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.56-1
+- Merge review (#226468):
+  - remove "ExclusiveOS: Linux"
+  - remove hicolor-icon-theme requirement, call gtk-update-icon-cache with full
+    path
+
 * Fri Oct 12 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.55-1
-- Merge review (#226468)
+- Merge review (#226468):
   - use xdg-open if available
   - obsolete redhat-config-samba with version
   - change license tag to GPLv2