Hello community, here is the log from the commit of package knot for openSUSE:Factory checked in at 2015-01-22 21:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knot (Old) and /work/SRC/openSUSE:Factory/.knot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "knot" Changes: -------- --- /work/SRC/openSUSE:Factory/knot/knot.changes 2015-01-08 23:02:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.knot.new/knot.changes 2015-01-22 21:49:27.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 8 10:07:50 UTC 2015 - tchvatal@suse.com + +- Add deps on the docu packages to regen documentation +- Enable systemd integration fully +- Add dep on libidn +- Cleanup with spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knot.spec ++++++ --- /var/tmp/diff_new_pack.3nZHRm/_old 2015-01-22 21:49:28.000000000 +0100 +++ /var/tmp/diff_new_pack.3nZHRm/_new 2015-01-22 21:49:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package knot # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,36 +16,39 @@ # +%if 0%{?suse_version} > 1140 +%define has_systemd 1 +BuildRequires: makeinfo +BuildRequires: python-Sphinx +BuildRequires: systemd-devel +%{?systemd_requires} +%endif Name: knot -Url: http://www.knot-dns.cz Version: 1.6.1 Release: 0 Summary: An authoritative DNS daemon License: GPL-3.0+ Group: Productivity/Networking/DNS/Servers -Requires(pre): pwdutils +Url: http://www.knot-dns.cz +Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz +Source1: knot.conf +Source2: knot.service +Patch0: 0001-loosen-openssl-dependency.patch +Patch1: 0002-make-configure.ac-compatible-with-old-tools.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: flex +BuildRequires: libidn-devel BuildRequires: libtool BuildRequires: liburcu-devel BuildRequires: openssl-devel BuildRequires: pkg-config -%if 0%{?suse_version} > 1140 -BuildRequires: systemd -%{?systemd_requires} -%define has_systemd 1 -%endif -%if 0%{?suse_version} > 1320 +Requires(pre): pwdutils +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1310 BuildRequires: lmdb-devel %endif -Source0: https://secure.nic.cz/files/knot-dns/%{name}-%{version}.tar.gz -Source1: knot.conf -Source2: knot.service -Patch0: 0001-loosen-openssl-dependency.patch -Patch1: 0002-make-configure.ac-compatible-with-old-tools.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Knot DNS is a high-performance authoritative DNS server implementation. @@ -54,23 +57,23 @@ %setup -q %patch0 -p1 %patch1 +autoreconf -fvi %build -%if 0%{suse_version} == 1210 -export SUSE_ASNEEDED=0 -%endif -autoreconf -fi %configure \ --sysconfdir=%{_sysconfdir} \ --libexecdir=%{_libexecdir}/%{name} \ - --localstatedir=/var/lib \ + --localstatedir=%{_localstatedir}/lib \ --libexecdir=%{_libexecdir}/%{name} \ --enable-recvmmsg=yes \ +%if 0%{?has_systemd} + --enable-systemd=yes \ +%endif --disable-silent-rules make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} install -d %{buildroot}%{_docdir}/%{name} install -d %{buildroot}%{_docdir}/%{name}/samples/ rm %{buildroot}%{_sysconfdir}/%{name}/* @@ -78,17 +81,18 @@ %if 0%{?has_systemd} install -d %{buildroot}%{_unitdir} install -p -m644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service +ln -s service %{buildroot}%{_sbindir}/rcknot %endif install -p -m644 COPYING AUTHORS NEWS THANKS README %{buildroot}%{_docdir}/%{name} install -p -m644 samples/*.conf samples/*.zone* %{buildroot}%{_docdir}/%{name}/samples/ -ln -s /sbin/service %{buildroot}%{_sbindir}/rcknot -rm %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print +rm -rf %{buildroot}%{_libdir}/*.so %pre getent group knot >/dev/null || groupadd -r knot getent passwd knot >/dev/null || \ -useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ --c "Knot DNS server" knot + useradd -r -g knot -d %{_sysconfdir}/knot -s /sbin/nologin \ + -c "Knot DNS server" knot %if 0%{?has_systemd} %service_add_pre %{name}.service %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org