Hello community,
here is the log from the commit of package dhcp for openSUSE:Factory
checked in at Mon May 16 11:17:20 CEST 2011.
--------
--- dhcp/dhcp.changes 2011-05-03 14:28:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/dhcp/dhcp.changes 2011-05-12
10:43:04.000000000 +0200
@@ -1,0 +2,12 @@
+Thu May 12 08:39:03 UTC 2011 - m...@suse.de
+
+- Removed obsolete sles8 compatibility dependencies, fixed
+ to avoid non-functional sles_version conditionals.
+
+-------------------------------------------------------------------
+Tue May 10 11:48:57 UTC 2011 - m...@suse.de
+
+- Fixed to not introduce separate dhcp-doc package on sles,
+ use versioned provides/obsoletes, improved conditionals.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcp.spec ++++++
--- /var/tmp/diff_new_pack.zwyLD7/_old 2011-05-16 11:14:13.000000000 +0200
+++ /var/tmp/diff_new_pack.zwyLD7/_new 2011-05-16 11:14:13.000000000 +0200
@@ -21,12 +21,16 @@
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define omc_prefix /usr/share/omc
%define omc_svcdir %{omc_prefix}/svcinfo.d
+# always on
%define with_ldap 1
-%define with_ldapcasa 0%{?sles_version} > 0
+# on sles, but sles_version is gone
+%define with_ldapcasa 0%{?sles_version} >= 10 || (%suse_version >= 1110 &&
%suse_version < 1140)
+# doc package is new on 11.3
+%define with_doc_package %suse_version >= 1130
Name: dhcp
-%if 0%{?with_ldap}
-%if 0%{?with_ldapcasa}
+%if %{with_ldap}
+%if %{with_ldapcasa}
BuildRequires: CASA-devel
%endif
BuildRequires: openldap2-devel
@@ -36,7 +40,7 @@
Group: Productivity/Networking/Boot/Servers
AutoReqProv: on
Version: 4.2.1.P1
-Release: 3
+Release: 5
Summary: Common Files Used by ISC DHCP Software
Url: http://www.isc.org/software/dhcp
Source0: dhcp-%{isc_version}.tar.bz2
@@ -86,6 +90,8 @@
##
PreReq: /bin/touch /sbin/chkconfig sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Provides: dhcp = %{version}
+Obsoletes: dhcp < %{version}
%package server
License: BSD3c(or similar)
@@ -93,7 +99,8 @@
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
+Obsoletes: dhcp-server < %{version}
AutoReqProv: on
%package client
@@ -102,7 +109,8 @@
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 +119,8 @@
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 +128,18 @@
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 +188,8 @@
--------
Internet Systems Consortium, Inc. <i...@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 +198,7 @@
--------
Internet Systems Consortium, Inc. <i...@isc.org>
+%endif
%description devel
This package contains all of the libraries and headers for developing
@@ -201,7 +220,7 @@
%patch15 -p0
%patch20 -p1
%patch21 -p1
-%if 0%{?with_ldap}
+%if %{with_ldap}
%patch30 -p1
%endif
%patch40 -p1
@@ -238,10 +257,10 @@
--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 +296,7 @@
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 +344,7 @@
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 +434,6 @@
%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 +461,7 @@
%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 +472,15 @@
%{_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)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
