Hello community,
here is the log from the commit of package leafnode for openSUSE:Factory checked in at 2017-06-20 09:39:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/leafnode (Old)
and /work/SRC/openSUSE:Factory/.leafnode.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "leafnode"
Tue Jun 20 09:39:39 2017 rev:8 rq:504220 version:1.11.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/leafnode/leafnode.changes 2015-08-27 08:57:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.leafnode.new/leafnode.changes 2017-06-20 09:39:42.085938364 +0200
@@ -1,0 +2,7 @@
+Fri Jun 16 11:36:40 UTC 2017 - aliouliaki@suse.com
+
+- Removed xinetd service
+- Added leafnode@.service and leafnode.socket
+- Clean up of leafnode.spec file
+
+-------------------------------------------------------------------
Old:
----
README.SuSE
leafnode.xinetd
New:
----
README.SUSE
leafnode.socket
leafnode@.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ leafnode.spec ++++++
--- /var/tmp/diff_new_pack.PosDex/_old 2017-06-20 09:39:42.745845322 +0200
+++ /var/tmp/diff_new_pack.PosDex/_new 2017-06-20 09:39:42.745845322 +0200
@@ -1,7 +1,7 @@
#
# spec file for package leafnode
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,31 +20,30 @@
Version: 1.11.11
Release: 0
Summary: A Leaf Site NNTP Server
-License: LGPL-2.1+ and SUSE-Public-Domain and MIT
+License: LGPL-2.1+ AND SUSE-Public-Domain AND MIT
Group: Productivity/Networking/News/Servers
Url: http://sourceforge.net/projects/leafnode/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
-Source1: README.SuSE
+Source1: README.SUSE
Source2: leafnode.cron.daily
Source3: filters
-Source4: leafnode.xinetd
+Source4: leafnode@.service
Source5: leafnode-fetch.cron
Source6: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz.asc
# https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/pgpkeys-developer...
Source7: leafnode.keyring
+Source8: leafnode.socket
Patch0: leafnode-1.11.6-spooldir-permissions.diff
BuildRequires: pcre-devel >= 2.06
-%if %{?suse_version} == 1110
-BuildRequires: xz
-%endif
+BuildRequires: systemd-rpm-macros
Requires: cron
-# FIXME: use proper Requires(pre/post/preun/...)
-PreReq: /bin/cat
-PreReq: /bin/mkdir
Conflicts: cnews
Conflicts: inn
Provides: nntp_daemon
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
+%if 0%{?suse_version} >= 1330
+Requires(pre): group(news)
+%endif
%description
Leafnode is a small NNTP server for leaf sites without permanent
@@ -57,8 +56,8 @@
%patch0
%build
-CFLAGS="-Wall %{optflags}"
-%configure --with-ipv6 \
+%configure\
+ --with-ipv6 \
--sysconfdir=%{_sysconfdir}/%{name} \
--with-spooldir=%{_localstatedir}/spool/news \
--with-lockfile=%{_localstatedir}/spool/news/leaf.node/lock.file
@@ -68,15 +67,17 @@
make %{?_smp_mflags} check
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-mkdir -p %{buildroot}/%{_sysconfdir}/cron.daily %{buildroot}/%{_sysconfdir}/xinetd.d
+%make_install
+mkdir -p %{buildroot}/%{_sysconfdir}/cron.daily
install -m 755 %{SOURCE2} %{buildroot}/%{_sysconfdir}/cron.daily/%{name}
-install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/xinetd.d/%{name}
-cp %{buildroot}/%{_sysconfdir}/%{name}/config.example %{buildroot}/%{_sysconfdir}/%{name}/config
+mv %{buildroot}/%{_sysconfdir}/%{name}/config.example %{buildroot}/%{_sysconfdir}/%{name}/config
install -m 644 %{SOURCE1} .
install -m 640 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name}
install -d -m 755 %{buildroot}%{_mandir}/de/man1
install -d -m 755 %{buildroot}%{_mandir}/de/man8
+install -D -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}/leafnode@.service
+install -D -m 644 %{SOURCE8} %{buildroot}/%{_unitdir}/leafnode.socket
+
# Get rid of files we don't want to package or package with doc below
rm -f %{buildroot}/%{_sysconfdir}/%{name}/*.dist
rm -f %{buildroot}/%{_sysconfdir}/%{name}/UNINSTALL-daemontools
@@ -85,16 +86,26 @@
cp -a update.sh tools examples
cp %{SOURCE5} examples
+%pre
+%service_add_pre leafnode@.service leafnode.socket
+
+%post
+%service_add_post leafnode@.service leafnode.socket
+
+%preun
+%service_del_preun leafnode@.service leafnode.socket
+
+%postun
+%service_del_postun leafnode@.service leafnode.socket
+
%files
%defattr(-,root,root)
%attr(640,root,news) %config(noreplace) %{_sysconfdir}/%{name}/config
-%attr(440,root,news) %config %{_sysconfdir}/%{name}/config.example
%attr(640,root,news) %config(noreplace) %{_sysconfdir}/%{name}/filters
%attr(755,root,root) %config(noreplace) %{_sysconfdir}/cron.daily/%{name}
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%attr(750,root,news) %dir %{_sysconfdir}/%{name}
%doc ChangeLog COPYING CREDITS NEWS FAQ.txt FAQ.pdf
-%doc README README.SuSE README-FQDN
+%doc README README.SUSE README-FQDN
%doc filters.example
%doc ADD-ONS KNOWNBUGS
%doc doc_german/INSTALL_de
@@ -102,13 +113,13 @@
%doc doc_german/README
%doc doc_german/README_de
%doc examples/
-%doc %{_mandir}/man1/newsq.1.gz
-%doc %{_mandir}/man1/leafnode-version.1.gz
-%doc %{_mandir}/man8/applyfilter.8.gz
-%doc %{_mandir}/man8/checkgroups.8.gz
-%doc %{_mandir}/man8/fetchnews.8.gz
-%doc %{_mandir}/man8/leafnode.8.gz
-%doc %{_mandir}/man8/texpire.8.gz
+%{_mandir}/man1/newsq.1%{ext_man}
+%{_mandir}/man1/leafnode-version.1%{ext_man}
+%{_mandir}/man8/applyfilter.8%{ext_man}
+%{_mandir}/man8/checkgroups.8%{ext_man}
+%{_mandir}/man8/fetchnews.8%{ext_man}
+%{_mandir}/man8/leafnode.8%{ext_man}
+%{_mandir}/man8/texpire.8%{ext_man}
%{_bindir}/newsq
%{_bindir}/leafnode-version
%{_sbindir}/applyfilter
@@ -117,5 +128,7 @@
%{_sbindir}/leafnode
%{_sbindir}/texpire
%attr(775,news,news) %{_localstatedir}/spool/news
+%{_unitdir}/leafnode.socket
+%{_unitdir}/leafnode@.service
%changelog
++++++ README.SUSE ++++++
Installation notes for Package leafnode
---------------------------------------
Last change: 2005-06-13
Authors: Lenz Grimmer