From 6c0b153f106cc4215e7fef0548759ccadadefc8207bb024c2b1632166a222d70 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 28 Dec 2018 23:13:19 +0000 Subject: [PATCH] undo unnecessary %{}ification OBS-URL: https://build.opensuse.org/package/show/network:dhcp/kea?expand=0&rev=8 --- kea.spec | 164 +++++++++++++++++++++++++++---------------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/kea.spec b/kea.spec index ded5931..7e8cb46 100644 --- a/kea.spec +++ b/kea.spec @@ -29,8 +29,8 @@ License: MPL-2.0 Group: Productivity/Networking/Boot/Servers URL: https://kea.isc.org/ #Git-Clone: git://github.com/isc-projects/kea -Source: http://ftp.isc.org/isc/kea/%{version}/kea-%{version}.tar.gz -Source2: http://ftp.isc.org/isc/kea/%{version}/kea-%{version}.tar.gz.asc +Source: http://ftp.isc.org/isc/kea/%version/kea-%version.tar.gz +Source2: http://ftp.isc.org/isc/kea/%version/kea-%version.tar.gz.asc # https://www.isc.org/downloads/software-support-policy/openpgp-key/ Source3: kea.keyring BuildRequires: autoconf >= 2.59 @@ -44,7 +44,7 @@ BuildRequires: postgresql-devel BuildRequires: xz BuildRequires: pkgconfig(libcrypto) Requires(pre): shadow -Suggests: %{name}-hooks = %{version} +Suggests: %name-hooks = %version %if 0%{with regen_files} BuildRequires: bison >= 3.0 BuildRequires: docbook-xsl-stylesheets @@ -272,28 +272,28 @@ Kea's database library for PostgreSQL. %package devel Summary: Development files for the Kea DHCP server Group: Development/Libraries/C and C++ -Requires: libkea-asiodns0 = %{version} -Requires: libkea-asiolink7 = %{version} -Requires: libkea-cc7 = %{version} -Requires: libkea-cfgclient6 = %{version} -Requires: libkea-cryptolink4 = %{version} -Requires: libkea-dhcp++11 = %{version} -Requires: libkea-dhcp_ddns1 = %{version} -Requires: libkea-dhcpsrv14 = %{version} -Requires: libkea-dns++3 = %{version} -Requires: libkea-eval10 = %{version} -Requires: libkea-exceptions0 = %{version} -Requires: libkea-hooks7 = %{version} -Requires: libkea-http4 = %{version} -Requires: libkea-log3 = %{version} -Requires: libkea-process3 = %{version} -Requires: libkea-stats2 = %{version} -Requires: libkea-threads2 = %{version} -Requires: libkea-util-io0 = %{version} -Requires: libkea-util5 = %{version} -Requires: libkea-database1 = %{version} -Requires: libkea-mysql0 = %{version} -Requires: libkea-pgsql0 = %{version} +Requires: libkea-asiodns0 = %version +Requires: libkea-asiolink7 = %version +Requires: libkea-cc7 = %version +Requires: libkea-cfgclient6 = %version +Requires: libkea-cryptolink4 = %version +Requires: libkea-dhcp++11 = %version +Requires: libkea-dhcp_ddns1 = %version +Requires: libkea-dhcpsrv14 = %version +Requires: libkea-dns++3 = %version +Requires: libkea-eval10 = %version +Requires: libkea-exceptions0 = %version +Requires: libkea-hooks7 = %version +Requires: libkea-http4 = %version +Requires: libkea-log3 = %version +Requires: libkea-process3 = %version +Requires: libkea-stats2 = %version +Requires: libkea-threads2 = %version +Requires: libkea-util-io0 = %version +Requires: libkea-util5 = %version +Requires: libkea-database1 = %version +Requires: libkea-mysql0 = %version +Requires: libkea-pgsql0 = %version # Bundy DHCP and Kea share the same origin, so conflict Conflicts: otheproviders(pkgconfig(dns++)) @@ -318,38 +318,38 @@ autoreconf -fi make %{?_smp_mflags} %install -b=%{buildroot} +b=%buildroot %make_install -find %{buildroot} -type f -name "*.la" -delete -print -mkdir -p "$b/%{_unitdir}" "$b/%{_prefix}/lib/tmpfiles.d" -ls -l "$b/%{_unitdir}/" "$b/%{_prefix}/lib/tmpfiles.d/" || : -cat <<-EOF >"$b/%{_unitdir}/kea.service" +find %buildroot -type f -name "*.la" -delete -print +mkdir -p "$b/%_unitdir" "$b/%_prefix/lib/tmpfiles.d" +ls -l "$b/%_unitdir/" "$b/%_prefix/lib/tmpfiles.d/" || : +cat <<-EOF >"$b/%_unitdir/kea.service" [Unit] Description=ISC Kea DHCP server Before=multi-user.target After=remote-fs.target network.target nss-lookup.target time-sync.target ldap.service ndsd.service [Service] Type=forking - Environment=KEA_PIDFILE_DIR=%{_rundir}/%{name} - ExecStart=%{_sbindir}/keactrl start - ExecReload=%{_sbindir}/keactrl reload - ExecStop=%{_sbindir}/keactrl stop + Environment=KEA_PIDFILE_DIR=%_rundir/%name + ExecStart=%_sbindir/keactrl start + ExecReload=%_sbindir/keactrl reload + ExecStop=%_sbindir/keactrl stop [Install] WantedBy=multi-user.target Alias=dhcp-server.service EOF -cat <<-EOF >"$b/%{_prefix}/lib/tmpfiles.d/kea.conf" +cat <<-EOF >"$b/%_prefix/lib/tmpfiles.d/kea.conf" d /run/kea 0775 keadhcp keadhcp - EOF -perl -i -pe 's{%{_localstatedir}/run}{/run};s{%{_localstatedir}/log/kea-}{%{_localstatedir}/log/kea/}' \ - "$b/%{_sysconfdir}/kea"/*.conf -mkdir -p "$b%{_localstatedir}/log/kea" -ln -s "%{_sbindir}/service" "%{buildroot}/%{_sbindir}/rc%{name}" +perl -i -pe 's{%_localstatedir/run}{/run};s{%_localstatedir/log/kea-}{%_localstatedir/log/kea/}' \ + "$b/%_sysconfdir/kea"/*.conf +mkdir -p "$b%_localstatedir/log/kea" +ln -s "%_sbindir/service" "%buildroot/%_sbindir/rc%name" %pre getent group keadhcp >/dev/null || groupadd -r keadhcp getent passwd keadhcp >/dev/null || useradd -r -N -M -g keadhcp \ - -s /sbin/nologin -d %{_localstatedir}/lib/kea -c "Kea DHCP server" \ + -s /sbin/nologin -d %_localstatedir/lib/kea -c "Kea DHCP server" \ keadhcp systemd-tmpfiles --create kea.conf || : %service_add_pre kea.service @@ -409,95 +409,95 @@ systemd-tmpfiles --create kea.conf || : %postun -n libkea-pgsql0 -p /sbin/ldconfig %files -%dir %{_sysconfdir}/kea -%config(noreplace) %{_sysconfdir}/kea/*.conf -%{_datadir}/doc/kea/ -%{_mandir}/man8/*.8%{?ext_man} -%{_bindir}/kea* -%{_sbindir}/rckea -%{_sbindir}/kea* -%{_sbindir}/perfdhcp -%{_datadir}/kea/ -%{_unitdir}/*.service -%{_prefix}/lib/tmpfiles.d/ -%attr(0775,keadhcp,keadhcp) %{_localstatedir}/log/kea/ -%ghost %dir %{_rundir}/%{name} +%dir %_sysconfdir/kea +%config(noreplace) %_sysconfdir/kea/*.conf +%_datadir/doc/kea/ +%_mandir/man8/*.8%{?ext_man} +%_bindir/kea* +%_sbindir/rckea +%_sbindir/kea* +%_sbindir/perfdhcp +%_datadir/kea/ +%_unitdir/*.service +%_prefix/lib/tmpfiles.d/ +%attr(0775,keadhcp,keadhcp) %_localstatedir/log/kea/ +%ghost %dir %_rundir/%name %files hooks -%dir %{_libdir}/hooks -%{_libdir}/hooks/libdhcp_stat_cmds.so -%{_libdir}/hooks/libdhcp_lease_cmds.so -%{_libdir}/hooks/libdhcp_ha.so +%dir %_libdir/hooks +%_libdir/hooks/libdhcp_stat_cmds.so +%_libdir/hooks/libdhcp_lease_cmds.so +%_libdir/hooks/libdhcp_ha.so %files -n libkea-asiodns0 -%{_libdir}/libkea-asiodns.so.0* +%_libdir/libkea-asiodns.so.0* %files -n libkea-asiolink7 -%{_libdir}/libkea-asiolink.so.7* +%_libdir/libkea-asiolink.so.7* %files -n libkea-cc7 -%{_libdir}/libkea-cc.so.7* +%_libdir/libkea-cc.so.7* %files -n libkea-cfgclient6 -%{_libdir}/libkea-cfgclient.so.6* +%_libdir/libkea-cfgclient.so.6* %files -n libkea-cryptolink4 -%{_libdir}/libkea-cryptolink.so.4* +%_libdir/libkea-cryptolink.so.4* %files -n libkea-dhcp++11 -%{_libdir}/libkea-dhcp++.so.11* +%_libdir/libkea-dhcp++.so.11* %files -n libkea-dhcp_ddns1 -%{_libdir}/libkea-dhcp_ddns.so.1* +%_libdir/libkea-dhcp_ddns.so.1* %files -n libkea-dhcpsrv14 -%{_libdir}/libkea-dhcpsrv.so.14* +%_libdir/libkea-dhcpsrv.so.14* %files -n libkea-dns++3 -%{_libdir}/libkea-dns++.so.3* +%_libdir/libkea-dns++.so.3* %files -n libkea-eval10 -%{_libdir}/libkea-eval.so.10* +%_libdir/libkea-eval.so.10* %files -n libkea-exceptions0 -%{_libdir}/libkea-exceptions.so.0* +%_libdir/libkea-exceptions.so.0* %files -n libkea-hooks7 -%{_libdir}/libkea-hooks.so.7* +%_libdir/libkea-hooks.so.7* %files -n libkea-http4 -%{_libdir}/libkea-http.so.4* +%_libdir/libkea-http.so.4* %files -n libkea-log3 -%{_libdir}/libkea-log.so.3* +%_libdir/libkea-log.so.3* %files -n libkea-stats2 -%{_libdir}/libkea-stats.so.2* +%_libdir/libkea-stats.so.2* %files -n libkea-process3 -%{_libdir}/libkea-process.so.3* +%_libdir/libkea-process.so.3* %files -n libkea-threads2 -%{_libdir}/libkea-threads.so.2* +%_libdir/libkea-threads.so.2* %files -n libkea-util-io0 -%{_libdir}/libkea-util-io.so.0* +%_libdir/libkea-util-io.so.0* %files -n libkea-util5 -%{_libdir}/libkea-util.so.5* +%_libdir/libkea-util.so.5* %files -n libkea-database1 -%{_libdir}/libkea-database.so.1* +%_libdir/libkea-database.so.1* %files -n libkea-mysql0 -%{_libdir}/libkea-mysql.so.0* +%_libdir/libkea-mysql.so.0* %files -n libkea-pgsql0 -%{_libdir}/libkea-pgsql.so.0* +%_libdir/libkea-pgsql.so.0* %files devel -%{_includedir}/kea/ -%{_libdir}/pkgconfig/*.pc -%{_libdir}/libkea*.so +%_includedir/kea/ +%_libdir/pkgconfig/*.pc +%_libdir/libkea*.so %changelog