rpms/system-config-samba/F-7 .cvsignore, 1.41, 1.42 sources, 1.42, 1.43 system-config-samba.spec, 1.46, 1.47

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-samba/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13925

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
update Polish, Serbian translations
$RPM_BUILD_ROOT -> %%{buildroot}
don't add distro specific desktop categories from Fedora 8 on (#277591)
attempt to put the tool into the System -> Administration menu (#249440)
require libuser-python from Fedora 8 on (#251354)
make use of force tagging (since mercurial 0.9.4)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	5 Sep 2007 07:25:38 -0000	1.41
+++ .cvsignore	10 Sep 2007 07:43:04 -0000	1.42
@@ -1 +1 @@
-system-config-samba-1.2.50.tar.bz2
+system-config-samba-1.2.51.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	5 Sep 2007 07:25:38 -0000	1.42
+++ sources	10 Sep 2007 07:43:04 -0000	1.43
@@ -1 +1 @@
-f69a4b61cfe21ce958314d82bd72f21d  system-config-samba-1.2.50.tar.bz2
+2c6a012fe8618563959999c66424fa55  system-config-samba-1.2.51.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-samba/F-7/system-config-samba.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- system-config-samba.spec	5 Sep 2007 07:25:38 -0000	1.46
+++ system-config-samba.spec	10 Sep 2007 07:43:04 -0000	1.47
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.50
+Version: 1.2.51
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/samba
 License: GPL
@@ -21,7 +21,11 @@
 Requires: usermode >= 1.36
 Requires: samba
 Requires: samba-common
+%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+Requires: libuser-python
+%else
 Requires: libuser
+%endif
 Requires: htmlview
 Requires(post): hicolor-icon-theme
 Requires(postun): hicolor-icon-theme
@@ -37,19 +41,20 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 desktop-file-install --vendor system --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --add-category X-Red-Hat-Base       \
-  --add-category X-Red-Hat-ServerConfig       \
-  $RPM_BUILD_ROOT%{_datadir}/applications/system-config-samba.desktop
+  --dir %{buildroot}%{_datadir}/applications             \
+%if 0%{?fedora}%{?rhel} && 0%{?fedora} <= 7 && 0%{?rhel} <= 5
+  --add-category SystemSetup \
+%endif
+  %{buildroot}%{_datadir}/applications/system-config-samba.desktop
 
 %find_lang %name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor
@@ -76,6 +81,14 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Mon Sep 10 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.51
+- update Polish, Serbian translations
+- $RPM_BUILD_ROOT -> %%{buildroot}
+- don't add distro specific desktop categories from Fedora 8 on (#277591)
+- attempt to put the tool into the System -> Administration menu (#249440)
+- require libuser-python from Fedora 8 on (#251354)
+- make use of force tagging (since mercurial 0.9.4)
+
 * Fri Aug 31 2007 Nils Philippsen <nphilipp at redhat.com> - 1.2.50
 - bundle the GPL