[hylafax+/el6] 5.5.3-1 release - update to 5.5.3, break out hylafax+-client package, and add sysconfig usage.
Lee Howard
faxguy at fedoraproject.org
Tue Feb 26 05:34:21 UTC 2013
commit d915dc315f0536c204fa0ad6968e1299b97d4d8f
Author: Lee Howard <faxguy at howardsilvan.com>
Date: Mon Feb 25 21:33:24 2013 -0800
5.5.3-1 release - update to 5.5.3, break out hylafax+-client
package, and add sysconfig usage.
hylafax+-badshebangs.patch | 120 --------
hylafax+-clearlinkage.patch | 22 --
hylafax+-moremanpages.patch | 623 ----------------------------------------
hylafax+.spec | 214 +++++++++++---
hylafax+_daily.cron | 4 +-
hylafax+_faxq_systemd.service | 3 +-
hylafax+_hfaxd_systemd.service | 3 +-
hylafax+_hourly.cron | 4 +-
hylafax+_sysconfig | 19 ++
9 files changed, 204 insertions(+), 808 deletions(-)
---
diff --git a/hylafax+.spec b/hylafax+.spec
index 4c0de39..0de5f54 100644
--- a/hylafax+.spec
+++ b/hylafax+.spec
@@ -2,8 +2,8 @@
Summary: An enterprise-strength fax server
Name: hylafax+
-Version: 5.5.2
-Release: 7%{?dist}
+Version: 5.5.3
+Release: 1%{?dist}
License: libtiff and BSD with advertising
Group: Applications/Communications
URL: http://hylafax.sourceforge.net
@@ -14,10 +14,12 @@ Source2: hylafax+_daily.cron
Source3: hylafax+_hourly.cron
Source4: hylafax+_hfaxd_systemd.service
Source5: hylafax+_faxq_systemd.service
+Source6: hylafax+_sysconfig
-Patch0: hylafax+-clearlinkage.patch
-Patch1: hylafax+-moremanpages.patch
-Patch2: hylafax+-badshebangs.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Provides: hylafax = %{version}-%{release}
+Requires: hylafax-client = %{version}-%{release}
BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, pam-devel, openldap-devel, lcms-devel, /usr/bin/tiffcp
%if 0%{?fedora} >= 16
@@ -31,13 +33,11 @@ BuildRequires: systemd
%endif
Requires: ghostscript, ghostscript-fonts, gawk, sharutils, mailx, crontabs, /usr/bin/tiffcp
Conflicts: mgetty-sendfax
-Provides: hylafax = %{version}-%{release}
Obsoletes: hylafax < 5.5.2-1
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
+
%if 0%{?fedora} >= 16
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -57,11 +57,17 @@ The fax clients may reside on machines different from the server
and client implementations exist for a number of platforms including
windows.
+%package client
+Summary: Client programs for HylaFAX fax servers
+Provides: hylafax-client = %{version}-%{release}
+
+%description client
+HylaFAX(tm) is a enterprise-strength fax server supporting
+Class 1 and 2 fax modems on UNIX systems. This package provides
+fax clients which may reside on machines different from the server.
+
%prep
%setup -q -n hylafax-%{version}
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
%build
# - Can't use the configure macro because HylaFAX configure script does
@@ -101,6 +107,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/{cron.daily,cron.hourly}
mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/hylafax
%if 0%{?fedora} >= 16
+mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
mkdir -p -m 755 $RPM_BUILD_ROOT%{_unitdir}
%else
mkdir -p -m 755 $RPM_BUILD_ROOT%{_initrddir}
@@ -133,16 +140,18 @@ make install -e \
%if 0%{?fedora} >= 16
install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/hylafax-hfaxd.service
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/hylafax-faxq.service
+install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/hylafax+
%else
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/hylafax+
%endif
-install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/hylafax
-install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/hylafax
+install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/hylafax+
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/hylafax+
# Prepare docdir by removing non-doc files
# Remove files that are not needed on Linux
rm -f $RPM_BUILD_ROOT%{_sbindir}/{faxsetup.irix,faxsetup.bsdi}
rm -f $RPM_BUILD_ROOT%{faxspool}/bin/{ps2fax.imp,ps2fax.dps}
+rm -f $RPM_BUILD_ROOT%{faxspool}/etc/dpsprinter.ps
rm -f $RPM_BUILD_ROOT%{faxspool}/COPYRIGHT
@@ -158,6 +167,8 @@ if [ 0$1 -eq 1 ]; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+%post client -p /sbin/ldconfig
+
%preun
if [ 0$1 -eq 0 ]; then
/bin/systemctl --no-reload disable hylafax-hfaxd.service > /dev/null 2>&1 || :
@@ -173,6 +184,9 @@ if [ 0$1 -ge 1 ]; then
/bin/systemctl try-restart hylafax-hfaxd.service >/dev/null 2>&1 || :
/bin/systemctl try-restart hylafax-faxq.service >/dev/null 2>&1 || :
fi
+
+%postun client -p /sbin/ldconfig
+
%else
%post
/sbin/ldconfig
@@ -180,6 +194,9 @@ if [ 0$1 -eq 1 ]; then
/sbin/chkconfig --add hylafax+
fi
+%post client
+/sbin/ldconfig
+
%preun
if [ 0$1 -eq 0 ]; then
/sbin/chkconfig --del hylafax+
@@ -191,62 +208,121 @@ fi
if [ 0$1 -ge 1 ]; then
/sbin/service hylafax+ condrestart >/dev/null 2>&1 || :
fi
+
+%postun client
+/sbin/ldconfig
+
%endif
%files
%if 0%{?fedora} >= 16
%{_unitdir}/hylafax-hfaxd.service
%{_unitdir}/hylafax-faxq.service
+%config(noreplace) %{_sysconfdir}/sysconfig/hylafax+
%endif
%doc CHANGES CONTRIBUTORS COPYRIGHT README TODO VERSION
-%{_libdir}/libfax*
-%{_mandir}/*/*
+%{_libdir}/libfaxserver*
+%{_mandir}/man5/doneq.5f.gz
+%{_mandir}/man5/hosts.hfaxd.5f.gz
+%{_mandir}/man5/hylafax-config.5f.gz
+%{_mandir}/man5/hylafax-info.5f.gz
+%{_mandir}/man5/hylafax-log.5f.gz
+%{_mandir}/man5/hylafax-server.5f.gz
+%{_mandir}/man5/hylafax-shutdown.5f.gz
+%{_mandir}/man5/pagermap.5f.gz
+%{_mandir}/man5/recvq.5f.gz
+%{_mandir}/man5/sendq.5f.gz
+%{_mandir}/man5/status.5f.gz
+%{_mandir}/man5/tsi.5f.gz
+%{_mandir}/man5/xferfaxlog.5f.gz
+%{_mandir}/man8/choptest.8c.gz
+%{_mandir}/man8/cqtest.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/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/faxstate.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/ps2fax.8c.gz
+%{_mandir}/man8/recvstats.8c.gz
+%{_mandir}/man8/tagtest.8c.gz
+%{_mandir}/man8/tsitest.8c.gz
+%{_mandir}/man8/wedged.8c.gz
+%{_mandir}/man8/xferfaxstats.8c.gz
+%{_mandir}/man8/faxmsg.8c.gz
+%{_mandir}/man8/hylafax.8c.gz
+%{_mandir}/man8/lockname.8c.gz
+%{_mandir}/man8/ondelay.8c.gz
+%{_mandir}/man8/probemodem.8c.gz
%dir %{_sysconfdir}/hylafax
-%dir %{_sysconfdir}/hylafax/faxmail
-%dir %{_sysconfdir}/hylafax/faxmail/application
-%dir %{_sysconfdir}/hylafax/faxmail/image
-%config(noreplace) %{_sysconfdir}/hylafax/faxcover.ps
-%config(noreplace) %{_sysconfdir}/hylafax/faxmail.ps
%config(noreplace) %{_sysconfdir}/hylafax/hfaxd.conf
-%config(noreplace) %{_sysconfdir}/hylafax/pagesizes
-%config(noreplace) %{_sysconfdir}/hylafax/typerules
%dir %{faxspool}/config
%dir %{faxspool}/dev
%{faxspool}/config/*
%{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*
%defattr(755,root,root,-)
%if 0%{?fedora} < 16
%{_initrddir}/hylafax+
%endif
-%config(noreplace) %{_sysconfdir}/cron.daily/hylafax
-%config(noreplace) %{_sysconfdir}/cron.hourly/hylafax
-%{_bindir}/*
-%{_sbindir}/*
+%{_sysconfdir}/cron.daily/hylafax+
+%{_sysconfdir}/cron.hourly/hylafax+
+%{_sbindir}/choptest
+%{_sbindir}/cqtest
+%{_sbindir}/faxabort
+%{_sbindir}/faxaddmodem
+%{_sbindir}/faxadduser
+%{_sbindir}/faxanswer
+%{_sbindir}/faxconfig
+%{_sbindir}/faxcron
+%{_sbindir}/faxdeluser
+%{_sbindir}/faxgetty
+%{_sbindir}/faxlock
+%{_sbindir}/faxmodem
+%{_sbindir}/faxmsg
+%{_sbindir}/faxq
+%{_sbindir}/faxqclean
+%{_sbindir}/faxquit
+%{_sbindir}/faxsend
+%{_sbindir}/faxstate
+%{_sbindir}/hfaxd
+%{_sbindir}/hylafax
+%{_sbindir}/lockname
+%{_sbindir}/ondelay
+%{_sbindir}/pagesend
+%{_sbindir}/probemodem
+%{_sbindir}/recvstats
+%{_sbindir}/tagtest
+%{_sbindir}/tsitest
+%{_sbindir}/xferfaxstats
%{faxspool}/bin/archive
-%{faxspool}/bin/common-functions
%{faxspool}/bin/dictionary
%{faxspool}/bin/faxrcvd
%{faxspool}/bin/mkcover
%{faxspool}/bin/notify
-%{faxspool}/bin/pcl2fax
-%{faxspool}/bin/pdf2fax.gs
%{faxspool}/bin/pollrcvd
-%{faxspool}/bin/ps2fax.gs
%{faxspool}/bin/qp-encode.awk
%{faxspool}/bin/rfc2047-encode.awk
-%{faxspool}/bin/tiff2fax
-%{faxspool}/bin/tiff2pdf
%{faxspool}/bin/wedged
-%{_sysconfdir}/hylafax/faxmail/application/pdf
-%{_sysconfdir}/hylafax/faxmail/application/octet-stream
-%{_sysconfdir}/hylafax/faxmail/image/tiff
%defattr(-,uucp,uucp,-)
%dir %{faxspool}
%dir %{faxspool}/client
@@ -265,8 +341,68 @@ fi
%defattr(600,uucp,uucp,-)
%config(noreplace) %{faxspool}/etc/hosts.hfaxd
+%files client
+%doc CHANGES CONTRIBUTORS COPYRIGHT README TODO VERSION
+%{_libdir}/libfaxutil*
+%{_mandir}/man1/*
+%{_mandir}/man5/dialrules.5f.gz
+%{_mandir}/man5/pagesizes.5f.gz
+%{_mandir}/man5/typerules.5f.gz
+%{_mandir}/man8/dialtest.8c.gz
+%{_mandir}/man8/faxinfo.8c.gz
+%{_mandir}/man8/faxwatch.8c.gz
+%{_mandir}/man8/faxsetup.8c.gz
+%{_mandir}/man8/pdf2fax.8c.gz
+%{_mandir}/man8/tiff2fax.8c.gz
+%{_mandir}/man8/tiffcheck.8c.gz
+%{_mandir}/man8/faxfetch.8c.gz
+%{_mandir}/man8/faxsetup.linux.8c.gz
+%{_mandir}/man8/typetest.8c.gz
+%dir %{_sysconfdir}/hylafax
+%dir %{_sysconfdir}/hylafax/faxmail
+%dir %{_sysconfdir}/hylafax/faxmail/application
+%dir %{_sysconfdir}/hylafax/faxmail/image
+%config(noreplace) %{_sysconfdir}/hylafax/faxcover.ps
+%config(noreplace) %{_sysconfdir}/hylafax/faxmail.ps
+%config(noreplace) %{_sysconfdir}/hylafax/pagesizes
+%config(noreplace) %{_sysconfdir}/hylafax/typerules
+%{faxspool}/bin/genfontmap.ps
+%config(noreplace) %{faxspool}/etc/dialrules*
+%defattr(755,root,root,-)
+%if 0%{?fedora} < 16
+%{_initrddir}/hylafax+
+%endif
+%{_bindir}/*
+%{_sbindir}/dialtest
+%{_sbindir}/edit-faxcover
+%{_sbindir}/faxfetch
+%{_sbindir}/faxinfo
+%{_sbindir}/faxsetup
+%{_sbindir}/faxsetup.linux
+%{_sbindir}/faxwatch
+%{_sbindir}/textfmt
+%{_sbindir}/tiffcheck
+%{_sbindir}/typetest
+%{faxspool}/bin/common-functions
+%{faxspool}/bin/pcl2fax
+%{faxspool}/bin/pdf2fax.gs
+%{faxspool}/bin/ps2fax.gs
+%{faxspool}/bin/tiff2fax
+%{faxspool}/bin/tiff2pdf
+%{_sysconfdir}/hylafax/faxmail/application/pdf
+%{_sysconfdir}/hylafax/faxmail/application/octet-stream
+%{_sysconfdir}/hylafax/faxmail/image/tiff
+%defattr(-,uucp,uucp,-)
+%dir %{faxspool}
+%dir %{faxspool}/etc
+
%changelog
-* Sat Dec 15 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-7
+* Mon Feb 25 2013 Lee Howard <faxguy at howardsilvan.com> - 5.5.3-1
+- update to 5.5.3
+- break out client utilities into hylafax+-client package
+- add sysconfig feature
+
+* Sat Dec 15 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-6
- make jbigkit-devel BuildRequires conditional for Fedora >= 16
* Tue Dec 11 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-6
diff --git a/hylafax+_daily.cron b/hylafax+_daily.cron
index 3591b28..83b745f 100644
--- a/hylafax+_daily.cron
+++ b/hylafax+_daily.cron
@@ -1,5 +1,7 @@
#!/bin/sh
-/usr/sbin/faxcron | mail -s "HylaFAX Usage Report" faxmaster
+. /etc/sysconfig/hylafax+
+
+/usr/sbin/faxcron $FAXCRON_OPTIONS | mail -s "HylaFAX Usage Report" faxmaster
exit 0
diff --git a/hylafax+_faxq_systemd.service b/hylafax+_faxq_systemd.service
index dab4a1f..06fff4a 100644
--- a/hylafax+_faxq_systemd.service
+++ b/hylafax+_faxq_systemd.service
@@ -6,7 +6,8 @@ ConditionPathExists=/var/spool/hylafax/etc/setup.cache
User=root
Group=root
Restart=always
-ExecStart=/usr/sbin/faxq -D
+EnvironmentFile=/etc/sysconfig/hylafax+
+ExecStart=/usr/sbin/faxq -D $FAXQ_OPTIONS
[Install]
WantedBy=multi-user.target
diff --git a/hylafax+_hfaxd_systemd.service b/hylafax+_hfaxd_systemd.service
index eb09071..bea7eb9 100644
--- a/hylafax+_hfaxd_systemd.service
+++ b/hylafax+_hfaxd_systemd.service
@@ -6,7 +6,8 @@ ConditionPathExists=/var/spool/hylafax/etc/setup.cache
User=root
Group=root
Restart=always
-ExecStart=/usr/sbin/hfaxd -d -i hylafax
+EnvironmentFile=/etc/sysconfig/hylafax+
+ExecStart=/usr/sbin/hfaxd -d $HFAXD_OPTIONS
[Install]
WantedBy=multi-user.target
diff --git a/hylafax+_hourly.cron b/hylafax+_hourly.cron
index a9592d2..3c767fa 100644
--- a/hylafax+_hourly.cron
+++ b/hylafax+_hourly.cron
@@ -1,5 +1,7 @@
#!/bin/sh
-/usr/sbin/faxqclean
+. /etc/sysconfig/hylafax+
+
+/usr/sbin/faxqclean $FAXQCLEAN_OPTIONS
exit 0
diff --git a/hylafax+_sysconfig b/hylafax+_sysconfig
new file mode 100644
index 0000000..69fec04
--- /dev/null
+++ b/hylafax+_sysconfig
@@ -0,0 +1,19 @@
+#
+# Put additional command-line options for hfaxd here
+#
+HFAXD_OPTIONS="-i hylafax"
+
+#
+# Put additional command-line options for faxq here
+#
+FAXQ_OPTIONS=
+
+#
+# Put command-line options for faxqclean here
+#
+FAXQCLEAN_OPTIONS=
+
+#
+# Put command-line options for faxcron here
+#
+FAXCRON_OPTIONS=
More information about the scm-commits
mailing list