So sprach Alexander Skwar am 2002-06-23 um 00:40:54 +0200 : > time, but shouldn't e.g. samba-server-ldap simply obsolete samba-server?
Attached is a diff to the 2.2.5-2mdk spec, which fixes this. Alexander Skwar -- How to quote: http://learn.to/quote (german) http://quote.6x.to (english) Homepage: http://www.iso-top.de | Jabber: [EMAIL PROTECTED] iso-top.de - Die günstige Art an Linux Distributionen zu kommen Uptime: 5 days 5 hours 39 minutes
--- samba.spec 2002-06-23 01:26:26.000000000 +0200 +++ samba.spec.obsoletes 2002-06-23 01:26:27.000000000 +0200 @@ -1,5 +1,5 @@ %define ver 2.2.5 -%define rel 2mdk +%define rel 2.9mdk %define vscanver 0.2.5a # 2.2.4 and 1 replace by samba-team at release @@ -206,12 +206,13 @@ %if %build_ldap %package server-ldap Summary: Samba (SMB) server programs with LDAP (only) support -Conflicts: samba-server +Obsoletes: samba-server +Provides: samba-server Requires: samba-common-ldap = %{version} %else %package server Summary: Samba (SMB) server programs. -Conflicts: samba-server-ldap +Obsoletes: samba-server-ldap Requires: samba-common = %{version} %endif Group: Networking/Other @@ -249,11 +250,12 @@ %if %build_ldap %package common-ldap Summary: Files used by both Samba servers and clients with LDAP support -Conflicts: samba-common +Obsoletes: samba-common +Provides: samba-common %else %package common Summary: Files used by both Samba servers and clients. -Conflicts: samba-common-ldap +Obsoletes: samba-common-ldap %endif Group: System/Servers @@ -277,14 +279,16 @@ %if %build_ldap %package swat-ldap Summary: The Samba Web Administration Tool (with LDAP support) -Conflicts: samba-swat -Requires: samba-server-ldap = %{version} xinetd +Obsoletes: samba-swat +Provides: samba-swat +Requires: samba-server-ldap = %{version} %else %package swat Summary: The Samba Web Administration Tool. -Conflicts: samba-swat-ldap -Requires: samba-server = %{version} xinetd +Obsoletes: samba-swat-ldap +Requires: samba-server = %{version} %endif +Requires: xinetd Group: System/Servers Provides: samba-swat swat @@ -306,12 +310,13 @@ %if %build_winbind && %build_ldap %package winbind-ldap Requires: samba-common-ldap = %{version} -Conflicts: samba-winbind +Obsoletes: samba-winbind +Provides: samba-winbind %endif %if %build_winbind && !%build_ldap %package winbind Requires: samba-common = %{version} -Conflicts: samba-winbind-ldap +Obsoletes: samba-winbind-ldap %endif %if %build_winbind Summary: Samba-winbind daemon, utilities and documentation @@ -1161,6 +1166,12 @@ %endif %changelog +* Sat Jun 22 2002 Alexander Skwar <[EMAIL PROTECTED]> 2.2.5-2.9mdk +- Don't make the -ldap packages Conflicts: with the "normal" packages, + but make them Obsoletes: each other. This doesn't make rpmlint happy if + the "normal" packages are built, since there'll be Obsoletes:'s without + Provides:'s, but that's exactly what I want + * Wed Jun 19 2002 Buchan Milne <[EMAIL PROTECTED]> 2.2.5-2mdk - Fix build on 8.1 (no nested conditionals) - Make provision for newer Mandrake releases