From 68b70aa623fb45dba4a9a6a4933893355feb06457620a567d885424f678e08b1 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 2 Oct 2011 00:09:30 +0000 Subject: [PATCH 1/2] Accepting request 82899 from home:jengelh:bl-b - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/request/show/82899 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=68 --- bind.changes | 6 ++++++ bind.spec | 51 +-------------------------------------------------- 2 files changed, 7 insertions(+), 50 deletions(-) diff --git a/bind.changes b/bind.changes index bf0c163..79670d5 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 17 19:36:58 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Fri Sep 16 15:48:23 CEST 2011 - ug@suse.de diff --git a/bind.spec b/bind.spec index f12b45b..e2f96c4 100644 --- a/bind.spec +++ b/bind.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: bind @@ -34,7 +33,6 @@ Provides: dns_daemon bind8 bind9 Obsoletes: bind8 bind9 Requires: %{name}-utils %{name}-chrootenv PreReq: %fillup_prereq %insserv_prereq bind-utils /bin/grep /bin/sed /bin/mkdir /usr/bin/tee /bin/chmod /bin/chown /bin/mv /bin/cat /usr/bin/dirname /usr/bin/diff /usr/bin/old /usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/usermod -AutoReqProv: on Url: http://isc.org/sw/bind/ Source: ftp://ftp.isc.org/isc/bind9/%{pkg_vers}/bind-%{pkg_vers}.tar.gz Source1: vendor-files.tar.bz2 @@ -81,12 +79,6 @@ Name System (DNS) protocols and provides an openly redistributable reference implementation of the major components of the Domain Name System. This package includes the components to operate a DNS server. - - -Authors: --------- - ISC Software - %package chrootenv License: BSD3c(or similar) ; MIT License (or similar) Summary: Chroot environment for BIND named and lwresd @@ -98,12 +90,6 @@ This package contains all directories and files which are common to the chroot environment of BIND named and lwresd. Most is part of the structure below /var/lib/named. - - -Authors: --------- - ISC Software - %package devel License: BSD3c(or similar) ; MIT License (or similar) Summary: Development Libraries and Header Files of BIND @@ -123,12 +109,6 @@ for building programs using the libraries of the Berkeley Internet Name Domain (BIND) Domain Name System implementation of the Domain Name System (DNS) protocols. - - -Authors: --------- - ISC Software - %package doc License: BSD3c(or similar) ; MIT License (or similar) Summary: BIND documentation @@ -142,12 +122,6 @@ Documentation of the Berkeley Internet Name Domain (BIND) Domain Name System implementation of the Domain Name System (DNS) protocols. This includes also the BIND Administrator Reference Manual (ARM). - - -Authors: --------- - ISC Software - %package libs License: BSD3c(or similar) ; MIT License (or similar) Summary: Shared libraries of BIND @@ -163,12 +137,6 @@ This package contains the shared libraries of the Berkeley Internet Name Domain (BIND) Domain Name System implementation of the Domain Name System (DNS) protocols. - - -Authors: --------- - ISC Software - %package lwresd License: BSD3c(or similar) ; MIT License (or similar) Summary: Lightweight Resolver Daemon @@ -188,12 +156,6 @@ communicate using a simple UDP-based protocol, the "lightweight resolver protocol" that is distinct from and simpler than the full DNS protocol. - - -Authors: --------- - ISC Software - %package utils License: BSD3c(or similar) ; MIT License (or similar) Summary: Utilities to query and test DNS @@ -211,14 +173,7 @@ This package includes the utilities host, dig, and nslookup used to test and query the Domain Name System (DNS). The Berkeley Internet Name Domain (BIND) DNS server is found in the package named bind. - - -Authors: --------- - ISC Software - %prep -[ "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" != "/" -a -d "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" ] && rm -rf "${RPM_BUILD_DIR}/%{pkg_name}-%{pkg_vers}" %setup -q -n %{pkg_name}-%{pkg_vers} #%setup -n %{pkg_name}-%{version} -T -D -a1 -a50 %setup -q -n %{pkg_name}-%{pkg_vers} -T -D -a1 @@ -302,7 +257,7 @@ CONFIGURE_OPTIONS="\ %{__make} %{?_smp_mflags} pushd contrib/idn/idnkit-1.0-src ./configure ${CONFIGURE_OPTIONS} -%{__make} %{?jobs:-j%jobs}; +%{__make} %{?_smp_mflags} popd # running BIND system tests # FIXME: enable make test if every test checks for a free port first; fixed port @@ -392,10 +347,6 @@ rm -rf include lib man map patch tools win wsock Makefile.in acconfig.h aclocal. popd # --------------------------------------------------------------------------- -%clean -[ "${RPM_BUILD_ROOT}" != "/" -a -d "${RPM_BUILD_ROOT}" ] && rm -rf "${RPM_BUILD_ROOT}" -# --------------------------------------------------------------------------- - %pre # Are we updating from a package named bind9? if test -d usr/share/doc/packages/bind9 && sbin/chkconfig -c named; then From 5d9eec831c89f9f342eb41443e28f15fe40fdfcef6ce3f624a433277c03b3b95 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 3 Oct 2011 11:38:53 +0000 Subject: [PATCH 2/2] Accepting request 85954 from home:coolo:removelibtool add libtool as buildrequires so we no longer rely on libtool in the project config of factory - it's only needed by <10% of all packages OBS-URL: https://build.opensuse.org/request/show/85954 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=69 --- bind.changes | 5 +++++ bind.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/bind.changes b/bind.changes index 79670d5..d0f48a5 100644 --- a/bind.changes +++ b/bind.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 30 20:07:45 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to make the spec file more reliable + ------------------------------------------------------------------- Sat Sep 17 19:36:58 UTC 2011 - jengelh@medozas.de diff --git a/bind.spec b/bind.spec index e2f96c4..4db89d6 100644 --- a/bind.spec +++ b/bind.spec @@ -24,6 +24,7 @@ BuildRequires: openldap2-devel BuildRequires: libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel BuildRequires: update-desktop-files BuildRequires: krb5-devel +BuildRequires: libtool Summary: Domain Name System (DNS) Server (named) Version: 9.8.1 Release: 1