diff --git a/dhcp.changes b/dhcp.changes
index b0e1ab4..652542e 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 10 11:48:57 UTC 2011 - mt@suse.de
+
+- Fixed to not introduce separate dhcp-doc package on sles,
+ use versioned rpm provides/obsoletes.
+
-------------------------------------------------------------------
Tue May 3 12:27:08 UTC 2011 - mt@suse.de
diff --git a/dhcp.spec b/dhcp.spec
index f60b431..f79510b 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -23,10 +23,11 @@
%define omc_svcdir %{omc_prefix}/svcinfo.d
%define with_ldap 1
%define with_ldapcasa 0%{?sles_version} > 0
+%define with_doc_package !0%{?sles_version}
Name: dhcp
-%if 0%{?with_ldap}
-%if 0%{?with_ldapcasa}
+%if %{with_ldap}
+%if %{with_ldapcasa}
BuildRequires: CASA-devel
%endif
BuildRequires: openldap2-devel
@@ -86,6 +87,8 @@ Patch45: dhcp-4.2.1-P1-dhclient-option-checks.bnc675052.diff
##
PreReq: /bin/touch /sbin/chkconfig sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: dhcp = %{version} dhcp-base:/usr/bin/omshell
+Obsoletes: dhcp < %{version} dhcp-base
%package server
License: BSD3c(or similar)
@@ -93,7 +96,8 @@ Summary: ISC DHCP Server
Group: Productivity/Networking/Boot/Servers
Requires: net-tools dhcp = %{version}
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
-Provides: dhcp_server dhcp_server6
+Provides: dhcp-server = %{version}, dhcp_server, dhcp_server6, dhcp:/usr/sbin/dhcpd
+Obsoletes: dhcp-server < %{version}
AutoReqProv: on
%package client
@@ -102,7 +106,8 @@ Summary: ISC DHCP Client
Group: Productivity/Networking/Boot/Clients
Requires: net-tools dhcp = %{version} /sbin/arping /usr/bin/host
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep
-Provides: dhcp_client dhcp_client6
+Provides: dhcp-client = %{version}, dhclient = %{version}, dhcp_client, dhcp_client6
+Obsoletes: dhcp-client < %{version}, dhclient < %{version}
AutoReqProv: on
%package relay
@@ -111,7 +116,8 @@ Summary: ISC DHCP Relay Agent
Group: Productivity/Networking/Boot/Servers
Requires: net-tools dhcp = %{version}
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
-Provides: dhcp_relay dhcp_relay6
+Provides: dhcp-relay = %{version}, dhcrelay = %{version}, dhcp_relay, dhcp_relay6
+Obsoletes: dhcp-relay < %{version}, dhcrelay < %{version}
AutoReqProv: on
%package devel
@@ -119,11 +125,17 @@ License: BSD3c(or similar)
Summary: Header Files and Libraries for dhcpctl API
Group: Development/Libraries/C and C++
Requires: dhcp = %{version}
+Provides: dhcp-devel = %{version}
+Obsoletes: dhcp-devel < %{version}
+%if %{with_doc_package}
%package doc
License: BSD3c(or similar)
Summary: Documentation
Group: Productivity/Networking/Boot/Servers
+Provides: dhcp-doc = %{version}
+Obsoletes: dhcp-doc < %{version}
+%endif
%description
This package contains common programs used by both the ISC DHCP
@@ -172,6 +184,7 @@ Authors:
--------
Internet Systems Consortium, Inc. <info@isc.org>
+%if %{with_doc_package}
%description doc
This package contains additional documentation files provided with
the software. The manual pages are in the corresponding packages.
@@ -180,6 +193,7 @@ Authors:
--------
Internet Systems Consortium, Inc. <info@isc.org>
+%endif
%description devel
This package contains all of the libraries and headers for developing
@@ -201,7 +215,7 @@ Authors:
%patch15 -p0
%patch20 -p1
%patch21 -p1
-%if 0%{?with_ldap}
+%if %{with_ldap}
%patch30 -p1
%endif
%patch40 -p1
@@ -238,10 +252,10 @@ autoreconf
--enable-failover \
--enable-paranoia \
--enable-early-chroot \
-%if 0%{?with_ldap}
+%if %{with_ldap}
--with-ldap \
--with-ldapcrypto \
-%if 0%{with_ldapcasa}
+%if %{with_ldapcasa}
--with-ldapcasa \
%endif
%endif
@@ -277,7 +291,7 @@ install -d -m0755 $RPM_BUILD_ROOT/sbin
install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
install -d -m0755 $RPM_BUILD_ROOT/%{susefw2dir}
install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir}
-%if 0%{?with_ldap}
+%if %{with_ldap}
install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
%endif
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run
@@ -325,7 +339,7 @@ install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
# another config files and scripts
-%if 0%{?with_ldap}
+%if %{with_ldap}
install -m0644 contrib/ldap/dhcp.schema \
$RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
%endif
@@ -415,13 +429,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%doc %{_mandir}/man5/dhcp-eval.5.gz
%doc %{_mandir}/man5/dhcp-options.5.gz
-%files doc
-%defattr(-,root,root)
-%doc LICENSE README RELNOTES
-%doc LIESMICH.* README.*
-%doc DDNS-howto.txt doc/*
-%doc contrib examples
-
%files server
%defattr(-,root,root)
%{_sbindir}/dhcpd
@@ -449,7 +456,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%doc %{_mandir}/man8/dhcpd.8.gz
%doc %{_mandir}/man5/dhcpd.conf.5.gz
%doc %{_mandir}/man5/dhcpd.leases.5.gz
-%if 0%{?with_ldap}
+%if %{with_ldap}
%dir %{_sysconfdir}/openldap
%dir %{_sysconfdir}/openldap/schema
%attr(0644, root, root) %config %{_sysconfdir}/openldap/schema/dhcp.schema
@@ -460,6 +467,14 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcpd
%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-dhcpd
+%if %{with_doc_package}
+%files doc
+%defattr(-,root,root)
+%endif
+%doc LICENSE README RELNOTES
+%doc LIESMICH.* README.*
+%doc DDNS-howto.txt doc/*
+%doc contrib examples
%files client
%defattr(-,root,root)