[rpms/inn] epel10.3: using of %{_tmpfilesdir} instaead of %{_sysconfdir}/tmpfiles.d/

[rpms/inn] epel10.3: using of %{_tmpfilesdir} instaead of %{_sysconfdir}/tmpfiles.d/

[Jochen Schmitt]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10.3
Commit : 2aca17cecb0272311757158cd933de23540b31d4
Author : Jochen Schmitt <Jochen@herr-schmitt.de>
Date   : 2013-01-23T17:12:17+01:00
Stats  : +7/-4 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/2aca17cecb0272311757158cd933de23540b31d4?branch=epel10.3

Log:
using of %{_tmpfilesdir} instaead of %{_sysconfdir}/tmpfiles.d/

---
diff --git a/inn.spec b/inn.spec
index 924e223..77dd038 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -211,8 +211,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -rf $RPM_BUILD_ROOT/usr/doc/
 
 # Use tmpfiles.d to create /var/run/news
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/inn.conf
+install -d $RPM_BUILD_ROOT%{_tmpfilesdir}
+cat <<EOF >$RPM_BUILD_ROOT%{_tmpfilesdir}/inn.conf
 D %{_localstatedir}/run/news 0755 news news -
 EOF
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/news
@@ -314,7 +314,7 @@ fi
 %{_unitdir}/innd-rnews.timer
 %defattr(-,news,news,-)
 # tmpfile.d files
-%config(noreplace) %attr(-,root,root) %{_sysconfdir}/tmpfiles.d/inn.conf
+%{_tmpfilesdir}/inn.conf
 %dir %{_localstatedir}/run/news
 # /etc/news config files
 %dir %{_sysconfdir}/news
@@ -542,6 +542,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jan 23 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-7
+- using of %%{_tmpfilesdir} instaead of %%{_sysconfdir}/tmpfiles.d/
+
 * Tue Jan 22 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-6
 - Fix some issues with the systemd timer units
 

[rpms/inn] epel10.3: Using of %{_tmpfilesdir} instaead of %{_sysconfdir}/tmpfiles.d/

[Jochen Schmitt]

            A new commit has been pushed.

            Repo   : rpms/inn
            Branch : epel10.3
            Commit : 54e5f20a8a9325f9d0b59bcd1c94373299da836e
            Author : Jochen Schmitt <Jochen@herr-schmitt.de>
            Date   : 2013-01-25T17:23:54+01:00
            Stats  : +67/-8 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/inn/c/54e5f20a8a9325f9d0b59bcd1c94373299da836e?branch=epel10.3

            Log:
            Using of %{_tmpfilesdir} instaead of %{_sysconfdir}/tmpfiles.d/

- Disable SMP build due an SMP-related issue
- Rework for the systemd timers. They will been enabled and started after install

---
diff --git a/inn-2.5.3-smp.patch b/inn-2.5.3-smp.patch
new file mode 100644
index 0000000..345ec3e
--- /dev/null
+++ b/inn-2.5.3-smp.patch
@@ -0,0 +1,42 @@
+diff -up inn-2.5.3/backends/Makefile.smp inn-2.5.3/backends/Makefile
+--- inn-2.5.3/backends/Makefile.smp	2013-01-24 10:30:27.228231136 +0100
++++ inn-2.5.3/backends/Makefile	2013-01-24 10:31:10.483027197 +0100
+@@ -71,7 +71,7 @@ profiled:
+ 
+ ##  Compilation rules.
+ 
+-BOTH		= $(LIBSTORAGE) $(LIBHIST) $(LIBSTORAGE) $(LIBINN)
++BOTH		= $(LIBSTORAGE) $(LIBHIST)  $(LIBINN)
+ 
+ LINK 		= $(LIBLD) $(LDFLAGS) -o $@
+ INNLIBS		= $(LIBINN) $(LIBS)
+diff -up inn-2.5.3/frontends/Makefile.smp inn-2.5.3/frontends/Makefile
+--- inn-2.5.3/frontends/Makefile.smp	2013-01-23 20:10:03.252485228 +0100
++++ inn-2.5.3/frontends/Makefile	2013-01-23 20:10:03.250485362 +0100
+@@ -85,7 +85,7 @@ ovdb_init:	ovdb_init.o    $(BOTH)   ; $(
+ ovdb_monitor:	ovdb_monitor.o $(BOTH)   ; $(LINK) ovdb_monitor.o $(STORELIBS)
+ ovdb_server:	ovdb_server.o  $(BOTH)   ; $(LINK) ovdb_server.o  $(STORELIBS)
+ ovdb_stat:	ovdb_stat.o    $(BOTH)   ; $(LINK) ovdb_stat.o    $(STORELIBS)
+-rnews:		rnews.o        $(LIBINN) ; $(LINK) rnews.o        -pie $(STORELIBS)
++rnews:		rnews.o        $(BOTH)   ; $(LINK) rnews.o        -pie $(STORELIBS)
+ sm:		sm.o           $(BOTH)   ; $(LINK) sm.o           $(STORELIBS)
+ 
+ ovdb_init.o: ovdb_init.c
+diff -up inn-2.5.3/innfeed/Makefile.smp inn-2.5.3/innfeed/Makefile
+--- inn-2.5.3/innfeed/Makefile.smp	2013-01-23 20:10:03.288482810 +0100
++++ inn-2.5.3/innfeed/Makefile	2013-01-23 20:10:03.286482944 +0100
+@@ -54,9 +54,13 @@ $(FIXSCRIPT):
+ 
+ INNFEEDLIBS	= $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
+ 
+-config_y.c config_y.h: configfile.y
++y.tab.c y.tab.h: configfile.y
+ 	$(YACC) -d $?
++
++config_y.h: y.tab.h
+ 	mv y.tab.h config_y.h
++
++config_y.c: y.tab.c
+ 	mv y.tab.c config_y.c
+ 
+ config_l.c: configfile.l

diff --git a/inn.spec b/inn.spec
index 77dd038..e8abe9f 100644
--- a/inn.spec
+++ b/inn.spec
@@ -144,7 +144,7 @@ export CFLAGS="$CFLAGS -fpic"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make %{?_smp_mflags}
+make # %{?_smp_mflags}
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -227,9 +227,14 @@ touch /var/log/news/news.err
 chown -R news:news /var/log/news*
 
 %systemd_post innd.service
-%systemd_post innd-expire.service
-%systemd_post innd-nntpsend.service
-%systemd_post innd-rnews.service
+
+systemctl enable innd-expire.timer >/dev/null
+systemctl enable innd-nntpsend.timer >/dev/null
+systemctl enable innd-rnews.timer >/dev/null
+
+systemctl start innd-expire.timer
+systemctl start innd-nntpsend.timer
+systemctl start innd-rnews.timer
 
 %post libs -p /sbin/ldconfig
 
@@ -282,10 +287,11 @@ if [ -f /etc/syslog.conf ]; then
 fi
 
 %preun
+%systemd_preun innd-expire.timer
+%systemd_preun innd-nntpsend.timer
+%systemd_preun innd-rnews.timer
 %systemd_preun innd.service
-%systemd_preun innd-expire.service
-%systemd_preun innd-nntpsend.service
-%systemd_preun innd-rnews.service
+
 if [ $1 = 0 ]; then
     if [ -f /var/lib/news/history.dir ]; then
        rm -f /var/lib/news/history.*
@@ -543,7 +549,9 @@ fi
 
 %changelog
 * Wed Jan 23 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-7
-- using of %%{_tmpfilesdir} instaead of %%{_sysconfdir}/tmpfiles.d/
+- Using of %%{_tmpfilesdir} instaead of %%{_sysconfdir}/tmpfiles.d/
+- Disable SMP build due an SMP-related issue
+- Rework for the systemd timers. They will been enabled and started after install
 
 * Tue Jan 22 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-6
 - Fix some issues with the systemd timer units

diff --git a/innd-expire.timer b/innd-expire.timer
index dbac016..06922f3 100644
--- a/innd-expire.timer
+++ b/innd-expire.timer
@@ -3,3 +3,6 @@ Description=Inetnet News Daemon Exp
 
 [Timer]
 OnUnitActiveSec=1d
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file

diff --git a/innd-nntpsend.timer b/innd-nntpsend.timer
index ab6f064..3f8c746 100644
--- a/innd-nntpsend.timer
+++ b/innd-nntpsend.timer
@@ -3,3 +3,6 @@ Description=Inetnet News Daemon NNTP Send
 
 [Timer]
 OnUnitActiveSec=1h
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file

diff --git a/innd-rnews.timer b/innd-rnews.timer
index 1fdac21..72a7fe7 100644
--- a/innd-rnews.timer
+++ b/innd-rnews.timer
@@ -3,3 +3,6 @@ Description=Inetnet News Daemon Receiving News
 
 [Timer]
 OnUnitActiveSec=1h
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file