[samba4/f17] Add missing conflict for samba-swat.

asn asn at fedoraproject.org
Mon Jun 4 12:35:29 UTC 2012


commit 38039c739bb261ec99d317b7b6e48543d0f8def7
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Mon Jun 4 13:28:15 2012 +0200

    Add missing conflict for samba-swat.

 samba4.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 1ea0085..dbe5d4b 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 51
+%define main_release 52
 
 %define samba_version 4.0.0
 %define talloc_version 2.0.7
@@ -283,6 +283,9 @@ Summary: The Samba SMB server Web configuration program
 Group: Applications/System
 Requires: %{name} = %{samba_depver}, xinetd
 
+Conflicts: samba-swat < 2:3.9.9
+Provides: samba-swat = %{samba_depver}
+
 %description swat
 The samba-swat package includes the new SWAT (Samba Web Administration
 Tool), for remotely managing Samba's smb.conf file using your favorite
@@ -1227,6 +1230,9 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
+* Mon Jun 04 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-52.alpha21
+- Add missing conflict for samba-swat.
+
 * Wed May 30 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-51.alpha21
 - Add missing iniparser-devel build requirement.
 


More information about the scm-commits mailing list