Accepting request 880720 from home:jengelh:branches:network
- Modernize specfile, and declare /bin/bash as required buildshell (use of {a,b} style expansion). OBS-URL: https://build.opensuse.org/request/show/880720 OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=316
This commit is contained in:
parent
1539ed7f3f
commit
3e40d2b6ff
@ -33,6 +33,12 @@ Thu Apr 8 09:23:22 UTC 2021 - Josef Möllers <josef.moellers@suse.com>
|
|||||||
(See CHANGES, item 4707)
|
(See CHANGES, item 4707)
|
||||||
[bind.spec, vendor-files.tar.bz2]
|
[bind.spec, vendor-files.tar.bz2]
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 23 12:34:53 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Modernize specfile, and declare /bin/bash as required buildshell
|
||||||
|
(use of {a,b} style expansion).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Mar 12 15:03:21 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
|
Fri Mar 12 15:03:21 UTC 2021 - Matthias Gerstner <matthias.gerstner@suse.com>
|
||||||
|
|
||||||
|
18
bind.spec
18
bind.spec
@ -16,6 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define _buildshell /bin/bash
|
||||||
%define VENDOR SUSE
|
%define VENDOR SUSE
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
%define with_systemd 1
|
%define with_systemd 1
|
||||||
@ -144,9 +145,7 @@ BuildArch: noarch
|
|||||||
This package provides a module which allows commands to be sent to rndc directly from Python programs.
|
This package provides a module which allows commands to be sent to rndc directly from Python programs.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -a1
|
%autosetup -p1 -a1
|
||||||
%patch52 -p1
|
|
||||||
%patch56 -p1
|
|
||||||
|
|
||||||
# use the year from source gzip header instead of current one to make reproducible rpms
|
# use the year from source gzip header instead of current one to make reproducible rpms
|
||||||
year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < %{SOURCE0})
|
year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < %{SOURCE0})
|
||||||
@ -204,7 +203,7 @@ sed -i '
|
|||||||
s|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
|
s|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
|
||||||
s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g
|
s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g
|
||||||
' libtool
|
' libtool
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
# special make for the Administrators Reference Manual
|
# special make for the Administrators Reference Manual
|
||||||
for d in arm; do
|
for d in arm; do
|
||||||
make -C doc/${d} SPHINXBUILD=sphinx-build doc
|
make -C doc/${d} SPHINXBUILD=sphinx-build doc
|
||||||
@ -251,7 +250,7 @@ mv vendor-files/config/rndc-access.conf %{buildroot}/%{_sysconfdir}/named.d
|
|||||||
ln -s /sbin/service %{buildroot}%{_sbindir}/rc${file}
|
ln -s /sbin/service %{buildroot}%{_sbindir}/rc${file}
|
||||||
done
|
done
|
||||||
install -D -m 0644 %{SOURCE70} %{buildroot}%{_prefix}/lib/tmpfiles.d/bind.conf
|
install -D -m 0644 %{SOURCE70} %{buildroot}%{_prefix}/lib/tmpfiles.d/bind.conf
|
||||||
install -D -m 0644 ${RPM_SOURCE_DIR}/named.root %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named/root.hint
|
install -D -m 0644 %{_sourcedir}/named.root %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named/root.hint
|
||||||
install -m 0644 vendor-files/config/{127.0.0,localhost}.zone %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named
|
install -m 0644 vendor-files/config/{127.0.0,localhost}.zone %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named
|
||||||
install -m 0644 bind.keys %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named/named.root.key
|
install -m 0644 bind.keys %{buildroot}%{_datadir}/factory%{_localstatedir}/lib/named/named.root.key
|
||||||
%else
|
%else
|
||||||
@ -260,14 +259,14 @@ mv vendor-files/config/rndc-access.conf %{buildroot}/%{_sysconfdir}/named.d
|
|||||||
ln -sf %{_initddir}/${file} %{buildroot}%{_sbindir}/rc${file}
|
ln -sf %{_initddir}/${file} %{buildroot}%{_sbindir}/rc${file}
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
install -m 0644 ${RPM_SOURCE_DIR}/named.root %{buildroot}%{_localstatedir}/lib/named/root.hint
|
install -m 0644 %{_sourcedir}/named.root %{buildroot}%{_localstatedir}/lib/named/root.hint
|
||||||
mv vendor-files/config/{127.0.0,localhost}.zone %{buildroot}%{_localstatedir}/lib/named
|
mv vendor-files/config/{127.0.0,localhost}.zone %{buildroot}%{_localstatedir}/lib/named
|
||||||
install -m 0755 vendor-files/tools/bind.genDDNSkey %{buildroot}/%{_bindir}/genDDNSkey
|
install -m 0755 vendor-files/tools/bind.genDDNSkey %{buildroot}/%{_bindir}/genDDNSkey
|
||||||
cp -a vendor-files/docu/BIND.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System
|
cp -a vendor-files/docu/BIND.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System
|
||||||
cp -p ${RPM_SOURCE_DIR}/dnszone-schema.txt %{buildroot}/%{_sysconfdir}/openldap/schema/dnszone.schema
|
cp -p %{_sourcedir}/dnszone-schema.txt %{buildroot}/%{_sysconfdir}/openldap/schema/dnszone.schema
|
||||||
cp -p "%{SOURCE60}" "%{buildroot}/%{_sysconfdir}/openldap/schema/dlz.schema"
|
cp -p "%{SOURCE60}" "%{buildroot}/%{_sysconfdir}/openldap/schema/dlz.schema"
|
||||||
install -m 0754 vendor-files/tools/ldapdump %{buildroot}/%{_datadir}/bind
|
install -m 0754 vendor-files/tools/ldapdump %{buildroot}/%{_datadir}/bind
|
||||||
find %{buildroot}/%{_libdir} -type f -name '*.so*' -print0 | xargs -0 chmod 0755
|
find %{buildroot}/%{_libdir} -type f -name '*.so*' -exec chmod 0755 {} +
|
||||||
for file in named-named; do
|
for file in named-named; do
|
||||||
install -m 0644 vendor-files/sysconfig/${file} %{buildroot}%{_fillupdir}/sysconfig.${file}
|
install -m 0644 vendor-files/sysconfig/${file} %{buildroot}%{_fillupdir}/sysconfig.${file}
|
||||||
done
|
done
|
||||||
@ -276,7 +275,7 @@ install -m 644 vendor-files/sysconfig/SuSEFirewall.named %{buildroot}/%{_sysconf
|
|||||||
%endif
|
%endif
|
||||||
# Cleanup doc
|
# Cleanup doc
|
||||||
rm doc/misc/Makefile*
|
rm doc/misc/Makefile*
|
||||||
find doc/arm -type f ! -name '*.html' -print0 | xargs -0 rm -f
|
find doc/arm -type f ! -name '*.html' -delete
|
||||||
# Create doc as we want it in bind and not bind-doc
|
# Create doc as we want it in bind and not bind-doc
|
||||||
for file in vendor-files/docu/README*; do
|
for file in vendor-files/docu/README*; do
|
||||||
basename=$( basename ${file})
|
basename=$( basename ${file})
|
||||||
@ -307,6 +306,7 @@ install -m 644 %{SOURCE72} %{buildroot}%{_sysusersdir}/
|
|||||||
%pre -f named.pre
|
%pre -f named.pre
|
||||||
%service_add_pre named.service
|
%service_add_pre named.service
|
||||||
%else
|
%else
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
%{GROUPADD_NAMED}
|
%{GROUPADD_NAMED}
|
||||||
%{USERADD_NAMED}
|
%{USERADD_NAMED}
|
||||||
|
Loading…
Reference in New Issue
Block a user