rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

- Removed obsolete sles8 compatibility dependencies, fixed

Browse Source 
to avoid non-functional sles_version conditionals.

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=71
This commit is contained in:
Marius Tomaschewski 2011-05-12 08:43:05 +00:00 committed by Git OBS Bridge
parent e09ac9d2ee
commit 1c0a388928
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 12 08:39:03 UTC 2011 - mt@suse.de
- Removed obsolete sles8 compatibility dependencies, fixed
to avoid non-functional sles_version conditionals.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 10 11:48:57 UTC 2011 - mt@suse.de Tue May 10 11:48:57 UTC 2011 - mt@suse.de

13
dhcp.spec
View File

@ -21,9 +21,12 @@
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define omc_prefix /usr/share/omc %define omc_prefix /usr/share/omc
%define omc_svcdir %{omc_prefix}/svcinfo.d %define omc_svcdir %{omc_prefix}/svcinfo.d
# always on
%define with_ldap 1 %define with_ldap 1
%define with_ldapcasa 0%{?sles_version} > 0 # on sles, but sles_version is gone
%define with_doc_package !0%{?sles_version} %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 Name: dhcp
%if %{with_ldap} %if %{with_ldap}
@ -87,8 +90,8 @@ Patch45: dhcp-4.2.1-P1-dhclient-option-checks.bnc675052.diff
## ##
PreReq: /bin/touch /sbin/chkconfig sysconfig PreReq: /bin/touch /sbin/chkconfig sysconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: dhcp = %{version} dhcp-base:/usr/bin/omshell Provides: dhcp = %{version}
Obsoletes: dhcp < %{version} dhcp-base Obsoletes: dhcp < %{version}
%package server %package server
License: BSD3c(or similar) License: BSD3c(or similar)
@ -96,7 +99,7 @@ Summary: ISC DHCP Server
Group: Productivity/Networking/Boot/Servers Group: Productivity/Networking/Boot/Servers
Requires: net-tools dhcp = %{version} Requires: net-tools dhcp = %{version}
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
Provides: dhcp-server = %{version}, dhcp_server, dhcp_server6, dhcp:/usr/sbin/dhcpd Provides: dhcp-server = %{version}, dhcp_server, dhcp_server6
Obsoletes: dhcp-server < %{version} Obsoletes: dhcp-server < %{version}
AutoReqProv: on AutoReqProv: on