Hello community,
here is the log from the commit of package hylafax+ for openSUSE:Factory
checked in at 2015-12-21 12:04:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-07-20
11:22:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.hylafax+.new/hylafax+.changes 2015-12-21
12:04:16.000000000 +0100
@@ -1,0 +2,16 @@
+Mon Dec 14 09:19:47 CET 2015 - p...@suse.de
+
+- Guard the inclusion of rchylafax+.
+
+-------------------------------------------------------------------
+Fri Dec 11 10:23:38 CET 2015 - p...@suse.de
+
+- Only run cron jobs if hylafax is configured (boo#958150)
+- Clean up the spec file a bit.
+- Fix build.
+- Export CFLAGS and CXXFLAGS so that the flags are imported by
+ configure.
+- Use 'make -j1' to prevent parallel building.
+- post and postun sections are always need.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hylafax+.spec ++++++
--- /var/tmp/diff_new_pack.61BOKD/_old 2015-12-21 12:04:18.000000000 +0100
+++ /var/tmp/diff_new_pack.61BOKD/_new 2015-12-21 12:04:18.000000000 +0100
@@ -16,24 +16,17 @@
#
-%global faxspool /var/spool/hylafax
-
+%global faxspool %{_localstatedir}/spool/hylafax
+%define lib_version %(echo %{version} | tr \. _)
+Name: hylafax+
+Version: 5.5.6
+Release: 0
Summary: An enterprise-strength fax server
License: BSD-3-Clause
Group: Productivity/Telephony/Servers
-Name: hylafax+
-Version: 5.5.6
-Release: 0%{?dist}
-
-%if 0%{?fedora} >= 16
-%else
-%endif
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
@@ -41,14 +34,20 @@
Source6: hylafax-faxgetty-ttyS0.service
Source7: README.SUSE
Source8: sendonly.conf
-
BuildRequires: gcc-c++
BuildRequires: ghostscript
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: pam-devel
BuildRequires: zlib-devel
-
+# Server checks for existence of sendfax
+Requires: hylafax+-client
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Conflicts: hylafax < 30.0.0
+Conflicts: mgetty-sendfax
+Provides: hylafax = 30.0.0
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?fedora} >= 16
BuildRequires: lcms-devel
BuildRequires: libtiff-tools
@@ -94,38 +93,22 @@
%if 0%{?suse_version} > 1200
BuildRequires: systemd
%endif
-# Server checks for existence of sendfax
-Requires: hylafax+-client
-
-Conflicts: mgetty-sendfax
-
-Conflicts: hylafax < 30.0.0
-Provides: hylafax = 30.0.0
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
%if 0%{?fedora} >= 16
Requires(post): systemd-units
-Requires(preun): systemd-units
Requires(postun): systemd-units
+Requires(preun): systemd-units
%endif
-
%if 0%{?suse_version} >= 1210
%{?systemd_requires}
%else
Requires(post): /sbin/chkconfig
+Requires(postun): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
-Requires(postun): /sbin/service
%endif
-%define lib_version %(echo %version | tr \. _)
-
%description
-HylaFAX(tm) is a enterprise-strength fax server supporting
+HylaFAX(tm) is an enterprise-strength fax server supporting
Class 1 and 2 fax modems on UNIX systems. It provides spooling
services and numerous supporting fax management tools.
The fax clients may reside on machines different from the server
@@ -133,17 +116,17 @@
windows.
%package -n libfaxutil%{lib_version}
-Summary: Runtime Library needed by both server and client.
+Summary: Runtime Library needed by both server and client
Group: System/Libraries
%description -n libfaxutil%{lib_version}
This runtime lib is needed by both the server and the client.
%package -n hylafax+-client
-Conflicts: sendfax
Summary: Linux client package for the Hylafax server
Group: Hardware/Fax
Conflicts: hylafax-client < 30.0.0
+Conflicts: sendfax
Provides: hylafax-client = 30.0.0
%description -n hylafax+-client
@@ -153,12 +136,15 @@
%prep
%setup -q -n hylafax-%{version}
-cp %{S:7} .
-cp %{S:8} .
+cp %{SOURCE7} .
+cp %{SOURCE8} .
%build
# - Can't use the configure macro because HylaFAX configure script does
# not understand the config options used by that macro
+
+export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+
STRIP=':' \
./configure \
--with-DIR_BIN=%{_bindir} \
@@ -166,7 +152,7 @@
--with-DIR_LIB=%{_libdir} \
--with-DIR_LIBEXEC=%{_sbindir} \
--with-DIR_LIBDATA=%{_sysconfdir}/hylafax \
- --with-DIR_LOCKS=/var/lock \
+ --with-DIR_LOCKS=%{_localstatedir}/lock \
--with-LIBDIR=%{_libdir} \
--with-TIFFBIN=%{_bindir} \
--with-DIR_MAN=%{_mandir} \
@@ -181,17 +167,13 @@
--with-PAGESIZE=A4 \
--with-PATH_DPSRIP=%{faxspool}/bin/ps2fax \
--with-PATH_IMPRIP="" \
- --with-SYSVINIT=%{_initrddir}/hylafax+ \
+ --with-SYSVINIT=%{_initddir}/hylafax+ \
--with-INTERACTIVE=no
-# can't use %{?_smp_mflags} because it breaks libfaxutil dso building
-make OPTIMIZER="%optflags"
+# can't use _smp_mflags because it breaks libfaxutil dso building
+make -j1
%install
-%if 0%{?fedora} != 0
-rm -rf %{buildroot}
-%endif
-
# install: make some dirs...
mkdir -p -m 755 %{buildroot}%{_sysconfdir}/{cron.daily,cron.hourly}
mkdir -p -m 755 %{buildroot}%{_sysconfdir}/hylafax
@@ -240,21 +222,20 @@
%endif
%if 0%{?sles_version} < 1200
-install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/hylafax+
+install -p -m 755 %{SOURCE1} %{buildroot}%{_initddir}/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
+ ln -s %{_sbindir}/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
+%if 0%{?sles_version} >= 1200 || 0%{?suse_version} >= 1210
+ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rchylafax+
+%endif
# not being executable is rather unconvenient
chmod +x %{buildroot}%{_sbindir}/edit-faxcover
@@ -320,8 +301,8 @@
#####End Systemd-setings
####SysV settings
-%if 0%{?sles_version} && 0%{?sles_version} < 1200
+%if 0%{?sles_version} && 0%{?sles_version} < 1200
%post
%{fillup_and_insserv %{name}}
/sbin/ldconfig
@@ -333,12 +314,12 @@
if [ $1 = 0 ] ; then
# exits with an error if hfax is not running
# %%{stop_on_removal %%{name}}
- if [ -x /usr/lib/lsb/remove_initd ]; then
- /usr/lib/lsb/install_initd %{_initrddir}/%{name}
+ if [ -x %{_libexecdir}/lsb/remove_initd ]; then
+ %{_libexecdir}/lsb/install_initd %{_initddir}/%{name}
elif [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --del %{name}
else
- rm -f /etc/rc.d/rc?.d/???%{name}
+ rm -f %{_sysconfdir}/rc.d/rc?.d/???%{name}
fi
/sbin/service %{name} stop >/dev/null 2>&1 || :
fi
@@ -346,17 +327,20 @@
%postun
if [ "$1" = "1" ]; then
%{restart_on_update %{name}}
-%{insserv_cleanup}
+%insserv_cleanup
fi
-%post -n libfaxutil%{lib_version} -p /sbin/ldconfig
-%postun -n libfaxutil%{lib_version} -p /sbin/ldconfig
-
%endif
####End SysV settings
#######SUSE adjust - end
+%post -n libfaxutil%{lib_version} -p /sbin/ldconfig
+
+%postun -n libfaxutil%{lib_version} -p /sbin/ldconfig
+
+
%files
+%defattr(-,root,root)
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?sles_version} >=
1200
%defattr(-,root,root,-)
%{_unitdir}/hylafax-hfaxd.service
@@ -365,72 +349,75 @@
%{_sbindir}/rchylafax-faxgetty-ttyS0
%{_sbindir}/rchylafax-faxq
%{_sbindir}/rchylafax-hfaxd
+%if 0%{?sles_version} >= 1200 || 0%{?suse_version} >= 1210
+%{_sbindir}/rchylafax+
+%endif
%endif
%defattr(-,uucp,uucp,-)
%doc CHANGES CONTRIBUTORS COPYRIGHT README TODO VERSION README.SUSE
sendonly.conf
%exclude %{_libdir}/libfaxutil*
%{_libdir}/libfax*
-%doc %{_mandir}/man5/hylafax-config.5f.gz
-%doc %{_mandir}/man5/doneq.5f.gz
-%doc %{_mandir}/man5/dialrules.5f.gz
-%doc %{_mandir}/man5/hosts.hfaxd.5f.gz
-%doc %{_mandir}/man5/hylafax-server.5f.gz
-%doc %{_mandir}/man5/hylafax-info.5f.gz
-%doc %{_mandir}/man5/hylafax-log.5f.gz
-%doc %{_mandir}/man5/pagermap.5f.gz
-%doc %{_mandir}/man5/pagesizes.5f.gz
-%doc %{_mandir}/man5/recvq.5f.gz
-%doc %{_mandir}/man5/sendq.5f.gz
-%doc %{_mandir}/man5/hylafax-shutdown.5f.gz
-%doc %{_mandir}/man5/status.5f.gz
-%doc %{_mandir}/man5/tsi.5f.gz
-%doc %{_mandir}/man5/typerules.5f.gz
-%doc %{_mandir}/man5/xferfaxlog.5f.gz
-%doc %{_mandir}/man8/choptest.8c.gz
-%doc %{_mandir}/man8/cqtest.8c.gz
-%doc %{_mandir}/man8/dialtest.8c.gz
-%doc %{_mandir}/man8/faxabort.8c.gz
-%doc %{_mandir}/man8/faxaddmodem.8c.gz
-%doc %{_mandir}/man8/faxadduser.8c.gz
-%doc %{_mandir}/man8/faxanswer.8c.gz
-%doc %{_mandir}/man8/faxconfig.8c.gz
-%doc %{_mandir}/man8/faxcron.8c.gz
-%doc %{_mandir}/man8/faxdeluser.8c.gz
-%doc %{_mandir}/man8/faxgetty.8c.gz
-%doc %{_mandir}/man8/faxinfo.8c.gz
-%doc %{_mandir}/man8/faxlock.8c.gz
-%doc %{_mandir}/man8/faxmodem.8c.gz
-%doc %{_mandir}/man8/faxq.8c.gz
-%doc %{_mandir}/man8/faxqclean.8c.gz
-%doc %{_mandir}/man8/faxquit.8c.gz
-%doc %{_mandir}/man8/faxrcvd.8c.gz
-%doc %{_mandir}/man8/faxsend.8c.gz
-%doc %{_mandir}/man8/faxsetup.8c.gz
-%doc %{_mandir}/man8/faxstate.8c.gz
-%doc %{_mandir}/man8/faxwatch.8c.gz
-%doc %{_mandir}/man8/hfaxd.8c.gz
-%doc %{_mandir}/man8/jobcontrol.8c.gz
-%doc %{_mandir}/man8/mkcover.8c.gz
-%doc %{_mandir}/man8/notify.8c.gz
-%doc %{_mandir}/man8/pagesend.8c.gz
-%doc %{_mandir}/man8/pollrcvd.8c.gz
-%doc %{_mandir}/man8/pdf2fax.8c.gz
-%doc %{_mandir}/man8/ps2fax.8c.gz
-%doc %{_mandir}/man8/recvstats.8c.gz
-%doc %{_mandir}/man8/tagtest.8c.gz
-%doc %{_mandir}/man8/tiff2fax.8c.gz
-%doc %{_mandir}/man8/tiffcheck.8c.gz
-%doc %{_mandir}/man8/tsitest.8c.gz
-%doc %{_mandir}/man8/wedged.8c.gz
-%doc %{_mandir}/man8/xferfaxstats.8c.gz
-%doc %{_mandir}/man8/faxfetch.8c.gz
-%doc %{_mandir}/man8/faxmsg.8c.gz
-%doc %{_mandir}/man8/faxsetup.linux.8c.gz
-%doc %{_mandir}/man8/hylafax.8c.gz
-%doc %{_mandir}/man8/lockname.8c.gz
-%doc %{_mandir}/man8/ondelay.8c.gz
-%doc %{_mandir}/man8/probemodem.8c.gz
-%doc %{_mandir}/man8/typetest.8c.gz
+%{_mandir}/man5/hylafax-config.5f.gz
+%{_mandir}/man5/doneq.5f.gz
+%{_mandir}/man5/dialrules.5f.gz
+%{_mandir}/man5/hosts.hfaxd.5f.gz
+%{_mandir}/man5/hylafax-server.5f.gz
+%{_mandir}/man5/hylafax-info.5f.gz
+%{_mandir}/man5/hylafax-log.5f.gz
+%{_mandir}/man5/pagermap.5f.gz
+%{_mandir}/man5/pagesizes.5f.gz
+%{_mandir}/man5/recvq.5f.gz
+%{_mandir}/man5/sendq.5f.gz
+%{_mandir}/man5/hylafax-shutdown.5f.gz
+%{_mandir}/man5/status.5f.gz
+%{_mandir}/man5/tsi.5f.gz
+%{_mandir}/man5/typerules.5f.gz
+%{_mandir}/man5/xferfaxlog.5f.gz
+%{_mandir}/man8/choptest.8c.gz
+%{_mandir}/man8/cqtest.8c.gz
+%{_mandir}/man8/dialtest.8c.gz
+%{_mandir}/man8/faxabort.8c.gz
+%{_mandir}/man8/faxaddmodem.8c.gz
+%{_mandir}/man8/faxadduser.8c.gz
+%{_mandir}/man8/faxanswer.8c.gz
+%{_mandir}/man8/faxconfig.8c.gz
+%{_mandir}/man8/faxcron.8c.gz
+%{_mandir}/man8/faxdeluser.8c.gz
+%{_mandir}/man8/faxgetty.8c.gz
+%{_mandir}/man8/faxinfo.8c.gz
+%{_mandir}/man8/faxlock.8c.gz
+%{_mandir}/man8/faxmodem.8c.gz
+%{_mandir}/man8/faxq.8c.gz
+%{_mandir}/man8/faxqclean.8c.gz
+%{_mandir}/man8/faxquit.8c.gz
+%{_mandir}/man8/faxrcvd.8c.gz
+%{_mandir}/man8/faxsend.8c.gz
+%{_mandir}/man8/faxsetup.8c.gz
+%{_mandir}/man8/faxstate.8c.gz
+%{_mandir}/man8/faxwatch.8c.gz
+%{_mandir}/man8/hfaxd.8c.gz
+%{_mandir}/man8/jobcontrol.8c.gz
+%{_mandir}/man8/mkcover.8c.gz
+%{_mandir}/man8/notify.8c.gz
+%{_mandir}/man8/pagesend.8c.gz
+%{_mandir}/man8/pollrcvd.8c.gz
+%{_mandir}/man8/pdf2fax.8c.gz
+%{_mandir}/man8/ps2fax.8c.gz
+%{_mandir}/man8/recvstats.8c.gz
+%{_mandir}/man8/tagtest.8c.gz
+%{_mandir}/man8/tiff2fax.8c.gz
+%{_mandir}/man8/tiffcheck.8c.gz
+%{_mandir}/man8/tsitest.8c.gz
+%{_mandir}/man8/wedged.8c.gz
+%{_mandir}/man8/xferfaxstats.8c.gz
+%{_mandir}/man8/faxfetch.8c.gz
+%{_mandir}/man8/faxmsg.8c.gz
+%{_mandir}/man8/faxsetup.linux.8c.gz
+%{_mandir}/man8/hylafax.8c.gz
+%{_mandir}/man8/lockname.8c.gz
+%{_mandir}/man8/ondelay.8c.gz
+%{_mandir}/man8/probemodem.8c.gz
+%{_mandir}/man8/typetest.8c.gz
%dir %{_sysconfdir}/hylafax
%dir %{_sysconfdir}/hylafax/faxmail
%dir %{_sysconfdir}/hylafax/faxmail/application
@@ -442,16 +429,16 @@
%{faxspool}/bin/dict/*
%{faxspool}/bin/genfontmap.ps
%{faxspool}/bin/auto-rotate.ps
-%{faxspool}/etc/dpsprinter.ps
-%{faxspool}/etc/cover.templ
-%{faxspool}/etc/lutRS18.pcf
-%{faxspool}/etc/LiberationSans-25.pcf
-%config(noreplace) %{faxspool}/etc/dialrules*
+%{faxspool}%{_sysconfdir}/dpsprinter.ps
+%{faxspool}%{_sysconfdir}/cover.templ
+%{faxspool}%{_sysconfdir}/lutRS18.pcf
+%{faxspool}%{_sysconfdir}/LiberationSans-25.pcf
+%config(noreplace) %{faxspool}%{_sysconfdir}/dialrules*
%defattr(755,root,root,-)
%if 0%{?fedora} < 16 || 0%{?sles_version} < 1210
-%{_initrddir}/hylafax+
-#%{_sbindir}/rchylafax+
+%{_initddir}/hylafax+
+#%%{_sbindir}/rchylafax+
%endif
%config(noreplace) %{_sysconfdir}/cron.daily/hylafax
@@ -521,7 +508,7 @@
%dir %{faxspool}/log
%dir %{faxspool}/recvq
%dir %{faxspool}/status
-%config(noreplace) %{faxspool}/etc/xferfaxlog
+%config(noreplace) %{faxspool}%{_sysconfdir}/xferfaxlog
%attr(700,uucp,uucp) %dir %{faxspool}/docq
%attr(700,uucp,uucp) %dir %{faxspool}/doneq
%attr(700,uucp,uucp) %dir %{faxspool}/archive
@@ -529,7 +516,7 @@
%attr(700,uucp,uucp) %dir %{faxspool}/tmp
%attr(700,uucp,uucp) %dir %{faxspool}/pollq
%defattr(600,uucp,uucp,-)
-%config(noreplace) %{faxspool}/etc/hosts.hfaxd
+%config(noreplace) %{faxspool}%{_sysconfdir}/hosts.hfaxd
%files -n libfaxutil%{lib_version}
%defattr(-, root, root)
++++++ hylafax+_daily.cron ++++++
--- /var/tmp/diff_new_pack.61BOKD/_old 2015-12-21 12:04:18.000000000 +0100
+++ /var/tmp/diff_new_pack.61BOKD/_new 2015-12-21 12:04:18.000000000 +0100
@@ -1,5 +1,9 @@
#!/bin/sh
+#------------------------------------------------
+# test if hylafax is running
+/usr/sbin/rchylafax status &>/dev/null || exit 0
+
/usr/sbin/faxcron | mail -s "HylaFAX Usage Report" faxmaster
exit 0
++++++ hylafax+_hourly.cron ++++++
--- /var/tmp/diff_new_pack.61BOKD/_old 2015-12-21 12:04:18.000000000 +0100
+++ /var/tmp/diff_new_pack.61BOKD/_new 2015-12-21 12:04:18.000000000 +0100
@@ -1,5 +1,9 @@
#!/bin/sh
+#------------------------------------------------
+# test if hylafax is running
+/usr/sbin/rchylafax status &>/dev/null || exit 0
+
/usr/sbin/faxqclean
exit 0
