rpms/samba4/devel samba4.spec,1.24,1.25

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20270

Modified Files:
	samba4.spec 
Log Message:

* Fri Jan 08 2010 Matthew Barnes <mbarnes at redhat.com> - 4.0.0-20.alpha10
- Only install new command-line utilities if enable_samba4 is non-zero.



Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- samba4.spec	8 Jan 2010 17:39:07 -0000	1.24
+++ samba4.spec	8 Jan 2010 22:23:29 -0000	1.25
@@ -1,4 +1,4 @@
-%define main_release 19
+%define main_release 20
 %define samba4_version 4.0.0
 
 %define talloc_version 2.0.1
@@ -475,8 +475,16 @@ rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/
 
 # Remove files for disabled subpackages.
 %if ! %enable_samba4
-rm $RPM_BUILD_ROOT%{_sbindir}/samba
 #rm $RPM_BUILD_ROOT%{_bindir}/mymachinepw
+rm $RPM_BUILD_ROOT%{_sbindir}/domainlevel
+rm $RPM_BUILD_ROOT%{_sbindir}/enableaccount
+rm $RPM_BUILD_ROOT%{_sbindir}/newuser
+rm $RPM_BUILD_ROOT%{_sbindir}/provision
+rm $RPM_BUILD_ROOT%{_sbindir}/pwsettings
+rm $RPM_BUILD_ROOT%{_sbindir}/samba
+rm $RPM_BUILD_ROOT%{_sbindir}/setexpiry
+rm $RPM_BUILD_ROOT%{_sbindir}/setpassword
+rm $RPM_BUILD_ROOT%{_sbindir}/upgradeprovision
 rm -r $RPM_BUILD_ROOT%{_datadir}/samba/setup
 %endif
 %if ! %enable_client
@@ -649,18 +657,18 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %doc COPYING WHATSNEW4.txt
+%if %enable_samba4
+%{_bindir}/mymachinepw
+%{_bindir}/smbstatus
 %{_sbindir}/domainlevel
 %{_sbindir}/enableaccount
 %{_sbindir}/newuser
 %{_sbindir}/provision
 %{_sbindir}/pwsettings
+%{_sbindir}/samba
 %{_sbindir}/setexpiry
 %{_sbindir}/setpassword
 %{_sbindir}/upgradeprovision
-%if %enable_samba4
-%{_sbindir}/samba
-%{_bindir}/mymachinepw
-%{_bindir}/smbstatus
 %{_datadir}/samba/setup
 %dir /var/lib/%{name}/sysvol
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -854,6 +862,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 08 2010 Matthew Barnes <mbarnes at redhat.com> - 4.0.0-20.alpha10
+- Only install new command-line utilities if enable_samba4 is non-zero.
+
 * Wed Jan 06 2010 Matthew Barnes <mbarnes at redhat.com> - 4.0.0-19.alpha10
 - Upgrade to alpha10