Hello community, here is the log from the commit of package leafnode for openSUSE:Factory checked in at 2015-04-02 16:03:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/leafnode (Old) and /work/SRC/openSUSE:Factory/.leafnode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "leafnode" Changes: -------- --- /work/SRC/openSUSE:Factory/leafnode/leafnode.changes 2013-06-13 16:48:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.leafnode.new/leafnode.changes 2015-04-02 16:03:45.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 24 20:28:23 UTC 2015 - astieger@suse.com + +- format spec file, remove gpg-offline fixing SLE 12 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ leafnode.spec ++++++ --- /var/tmp/diff_new_pack.tfXS52/_old 2015-04-02 16:03:45.000000000 +0200 +++ /var/tmp/diff_new_pack.tfXS52/_new 2015-04-02 16:03:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package leafnode # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -17,12 +17,8 @@ Name: leafnode -BuildRequires: pcre-devel >= 2.06 -Provides: nntp_daemon -Conflicts: inn cnews Version: 1.11.10 Release: 0 -PreReq: /bin/mkdir /bin/cat Summary: A Leaf Site NNTP Server License: LGPL-2.1+ and SUSE-Public-Domain and MIT Group: Productivity/Networking/News/Servers @@ -37,11 +33,15 @@ # https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/pgpkeys-developer... Source7: leafnode.keyring Patch0: leafnode-1.11.6-spooldir-permissions.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pcre-devel >= 2.06 Requires: cron -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif +# 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 %description Leafnode is a small NNTP server for leaf sites without permanent @@ -49,58 +49,38 @@ to automatically fetch the newsgroups the user reads regularly from the ISP's news server. - - -Authors: --------- - Matthias Andree <matthias.andree@gmx.de> (maintainer since 1.9.19) - Arnt Gulbrandsen <agulbra@troll.no> - Cornelius Krasel <krasel@wpxx02.toxi.uni-wuerzburg.de> - Kent Robotti <robotti@erols.com> - Markus Enzenberger <enz@cip.physik.uni-muenchen.de> - Randolf Skerka <rskerka@metronet.de> - Alexander Reinwarth <a.reinwarth@gmx.de> - Alexander Stielau <aleks@zedat.fu-berlin.de> - Ralf Wildenhues <ralf.wildenhues@gmx.de> - - %prep -%{?gpg_verify: %gpg_verify %{S:6}} -%setup -q -n %{name}-%{version} +%setup -q %patch0 %build -CFLAGS="-Wall $RPM_OPT_FLAGS" +CFLAGS="-Wall %{optflags}" %configure --with-ipv6 \ --sysconfdir=%{_sysconfdir}/%{name} \ --with-spooldir=%{_localstatedir}/spool/news \ --with-lockfile=%{_localstatedir}/spool/news/leaf.node/lock.file -%__make +make %{?_smp_mflags} %check -%__make check +make %{?_smp_mflags} check %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/%{name} -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/%{name} -cp $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config.example $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config +make DESTDIR=%{buildroot} install %{?_smp_mflags} +mkdir -p %{buildroot}/%{_sysconfdir}/cron.daily %{buildroot}/%{_sysconfdir}/xinetd.d +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 install -m 644 %{SOURCE1} . -install -m 640 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/de/man1 -install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/de/man8 +install -m 640 %{SOURCE3} %{buildroot}/%{_sysconfdir}/%{name} +install -d -m 755 %{buildroot}%{_mandir}/de/man1 +install -d -m 755 %{buildroot}%{_mandir}/de/man8 # Get rid of files we don't want to package or package with doc below -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/*.dist -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/UNINSTALL-daemontools -rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/filters.example +rm -f %{buildroot}/%{_sysconfdir}/%{name}/*.dist +rm -f %{buildroot}/%{_sysconfdir}/%{name}/UNINSTALL-daemontools +rm -f %{buildroot}/%{_sysconfdir}/%{name}/filters.example mkdir examples cp -a update.sh tools examples -cp %{S:5} examples - -%clean -# Clear up the mess -rm -rf $RPM_BUILD_ROOT; +cp %{SOURCE5} examples %files %defattr(-,root,root) @@ -126,13 +106,13 @@ %doc %{_mandir}/man8/fetchnews.8.gz %doc %{_mandir}/man8/leafnode.8.gz %doc %{_mandir}/man8/texpire.8.gz -/usr/bin/newsq -/usr/bin/leafnode-version -/usr/sbin/applyfilter -/usr/sbin/checkgroups -/usr/sbin/fetchnews -/usr/sbin/leafnode -/usr/sbin/texpire -%attr(775,news,news) /var/spool/news +%{_bindir}/newsq +%{_bindir}/leafnode-version +%{_sbindir}/applyfilter +%{_sbindir}/checkgroups +%{_sbindir}/fetchnews +%{_sbindir}/leafnode +%{_sbindir}/texpire +%attr(775,news,news) %{_localstatedir}/spool/news %changelog