Hello community, here is the log from the commit of package hylafax+ for openSUSE:Factory checked in at 2014-11-26 10:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hylafax+ (Old) and /work/SRC/openSUSE:Factory/.hylafax+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hylafax+" Changes: -------- --- /work/SRC/openSUSE:Factory/hylafax+/hylafax+.changes 2014-11-15 12:16:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hylafax+.new/hylafax+.changes 2014-11-26 10:33:14.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Nov 14 17:48:58 UTC 2014 - axel.braun@gmx.de + +-fix inclusion of initscript for SysV startup + +------------------------------------------------------------------- +Wed Nov 12 10:23:05 UTC 2014 - axel.braun@gmx.de + +- Adapt README.SUSE to renamed service files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hylafax+.spec ++++++ --- /var/tmp/diff_new_pack.aqtC5i/_old 2014-11-26 10:33:15.000000000 +0100 +++ /var/tmp/diff_new_pack.aqtC5i/_new 2014-11-26 10:33:15.000000000 +0100 @@ -30,7 +30,9 @@ URL: http://hylafax.sourceforge.net Source0: http://downloads.sourceforge.net/hylafax/hylafax-%{version}.tar.gz +#%if 0%{?sles_version} < 1200 Source1: hylafax+_rh.init +#%endif Source2: hylafax+_daily.cron Source3: hylafax+_hourly.cron Source4: hylafax-hfaxd.service @@ -177,7 +179,7 @@ mkdir -p -m 755 %{buildroot}%{_sysconfdir}/{cron.daily,cron.hourly} mkdir -p -m 755 %{buildroot}%{_sysconfdir}/hylafax -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?sles_version} >= 1200 mkdir -p -m 755 %{buildroot}%{_unitdir} %endif @@ -213,16 +215,31 @@ install -p -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/hylafax-faxgetty-ttyS0.service %endif -%if 0%{?suse_version} >= 1210 +%if 0%{?suse_version} >= 1210 || 0%{?sles_version} >= 1200 install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/hylafax-hfaxd.service install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/hylafax-faxq.service install -p -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/hylafax-faxgetty-ttyS0.service + %endif +%if 0%{?sles_version} < 1200 install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/hylafax+ +%endif install -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/hylafax install -p -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.hourly/hylafax + +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?sles_version} >= 1200 +for lnk in hylafax-hfaxd hylafax-faxgetty-ttyS0 hylafax-faxq; do + ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc$lnk +done +%endif + +# ABR: rchylafax+? No Service in non-systemd Distros +#%if 0%{?fedora} < 16 || 0%{?sles_version} < 1200 +# ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rchylafax+ +#%endif + # Prepare docdir by removing non-doc files # Remove files that are not needed on Linux rm -f %{buildroot}%{_sbindir}/{faxsetup.irix,faxsetup.bsdi} @@ -256,21 +273,35 @@ %endif ########SUSE adjust - begin +#####Systemd settings + +%if 0%{?sles_version} >= 1200 || 0%{?suse_version} >= 1210 +%pre +%service_add_pre hylafax-faxq.service +%service_add_pre hylafax-faxgetty-ttyS0.service +%service_add_pre hylafax-hfaxd.service -%if 0%{?suse_version} >= 1210 %post /sbin/ldconfig -%service_add_post +%service_add_post hylafax-faxq.service +%service_add_post hylafax-faxgetty-ttyS0.service +%service_add_post hylafax-hfaxd.service %preun -%service_del_preun +%service_del_preun hylafax-faxq.service +%service_del_preun hylafax-faxgetty-ttyS0.service +%service_del_preun hylafax-hfaxd.service %postun /sbin/ldconfig -%service_del_postun +%service_del_postun hylafax-faxq.service +%service_del_postun hylafax-faxgetty-ttyS0.service +%service_del_postun hylafax-hfaxd.service %endif +#####End Systemd-setings -%if 0%{?suse_version} && 0%{?suse_version} < 1210 +####SysV settings +%if 0%{?sles_version} && 0%{?sles_version} < 1200 %post %{fillup_and_insserv %{name}} @@ -299,15 +330,19 @@ %{insserv_cleanup} fi %endif +####End SysV settings #######SUSE adjust - end %files -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?sles_version} >= 1200 %defattr(-,root,root,-) %{_unitdir}/hylafax-hfaxd.service %{_unitdir}/hylafax-faxq.service %{_unitdir}/hylafax-faxgetty-ttyS0.service +%{_sbindir}/rchylafax-faxgetty-ttyS0 +%{_sbindir}/rchylafax-faxq +%{_sbindir}/rchylafax-hfaxd %endif %defattr(-,uucp,uucp,-) %doc CHANGES CONTRIBUTORS COPYRIGHT README TODO VERSION README.SUSE @@ -394,9 +429,12 @@ %{faxspool}/etc/LiberationSans-25.pcf %config(noreplace) %{faxspool}/etc/dialrules* %defattr(755,root,root,-) -%if 0%{?fedora} < 16 || 0%{?suse_version} < 1210 + +%if 0%{?fedora} < 16 || 0%{?sles_version} < 1210 %{_initrddir}/hylafax+ +#%{_sbindir}/rchylafax+ %endif + %config(noreplace) %{_sysconfdir}/cron.daily/hylafax %config(noreplace) %{_sysconfdir}/cron.hourly/hylafax %{_sbindir}/choptest ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.aqtC5i/_old 2014-11-26 10:33:15.000000000 +0100 +++ /var/tmp/diff_new_pack.aqtC5i/_new 2014-11-26 10:33:15.000000000 +0100 @@ -18,13 +18,13 @@ hylafax comes with three systemd service files. The first two are needed when you want to send faxes from your server: -hylafax-hfaxd_systemd.service - the hylafax server -hylafax-faxq_systemd.service - the fax scheduler +hylafax-hfaxd.service - the hylafax server +hylafax-faxq.service - the fax scheduler Enable systemd service for the daemons. They will start at boot time: -systemctl enable hylafax-hfaxd_systemd.service -systemctl enable hylafax-faxq_systemd.service +systemctl enable hylafax-hfaxd.service +systemctl enable hylafax-faxq.service Receiving faxes --------------- @@ -48,7 +48,7 @@ Many installations run hylafax just for sending faxes. To get this up and running, the command faxmodem needs to run after hylafax is started. -In a systemd environment, it is easiest to modify your hylafax-hfaxd_systemd.service in the way that you add the command +In a systemd environment, it is easiest to modify your hylafax-hfaxd.service in the way that you add the command ExecStartPost=/usr/bin/faxmodem ttyS0 right after the ExecStart - line. Parameter is the device the modem is attached to. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org