Hello community, here is the log from the commit of package hylafax+ for openSUSE:Factory checked in at 2017-08-10 14:03:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hylafax+ (Old) and /work/SRC/openSUSE:Factory/.hylafax+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hylafax+" Thu Aug 10 14:03:28 2017 rev:15 rq:511877 version:5.5.9 Changes: -------- --- /work/SRC/openSUSE:Factory/hylafax+/hylafax+.changes 2017-04-06 11:02:59.572437704 +0200 +++ /work/SRC/openSUSE:Factory/.hylafax+.new/hylafax+.changes 2017-08-10 14:11:47.459090693 +0200 @@ -1,0 +2,8 @@ +Fri Jul 21 13:54:38 UTC 2017 - [email protected] + +- Drop hylafax+_rh.init +- Drop conditionals for distros we never build against in OBS +- Switch to LCMS2 +- Add jbikgit-devel dependency so it is detected by configure + +------------------------------------------------------------------- Old: ---- hylafax+_rh.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hylafax+.spec ++++++ --- /var/tmp/diff_new_pack.MkuWnA/_old 2017-08-10 14:11:48.454950479 +0200 +++ /var/tmp/diff_new_pack.MkuWnA/_new 2017-08-10 14:11:48.466948790 +0200 @@ -1,7 +1,7 @@ # # spec file for package hylafax+ # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -26,7 +26,6 @@ Group: Productivity/Telephony/Servers Url: http://hylafax.sourceforge.net Source0: http://downloads.sourceforge.net/hylafax/hylafax-%{version}.tar.gz -Source1: hylafax+_rh.init Source2: hylafax+_daily.cron Source3: hylafax+_hourly.cron Source4: hylafax-hfaxd.service @@ -36,76 +35,28 @@ Source8: sendonly.conf BuildRequires: gcc-c++ BuildRequires: ghostscript +BuildRequires: libjbig-devel 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 -BuildRequires: openldap-devel -BuildRequires: systemd-units -Requires: cron -Requires: crontabs -Requires: gawk -Requires: ghostscript -Requires: ghostscript-fonts -Requires: libtiff-tools -Requires: mailx -Requires: sharutils -%endif -%if 0%{?fedora} > 16 -BuildRequires: jbigkit-devel -%endif -%if 0%{?fedora} >= 18 -BuildRequires: jbigkit-devel -BuildRequires: lcms-devel -BuildRequires: libtiff-tools -BuildRequires: openldap-devel -BuildRequires: systemd -Requires: crontabs -Requires: gawk -Requires: ghostscript -Requires: ghostscript-fonts -Requires: mailx -Requires: sharutils -%endif -%if 0%{?suse_version} -BuildRequires: jbigkit -BuildRequires: liblcms-devel BuildRequires: openldap2-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(zlib) Requires: cron Requires: gawk Requires: ghostscript Requires: ghostscript-fonts +# Server checks for existence of sendfax +Requires: hylafax+-client Requires: mailx Requires: sharutils Requires: tiff -%endif -%if 0%{?suse_version} > 1200 -BuildRequires: systemd -%endif -%if 0%{?fedora} >= 16 -Requires(post): systemd-units -Requires(postun): systemd-units -Requires(preun): systemd-units -%endif -%if 0%{?suse_version} >= 1210 +Conflicts: hylafax < 30.0.0 +Conflicts: mgetty-sendfax +Provides: hylafax = 30.0.0 %{?systemd_requires} -%else -Requires(post): /sbin/chkconfig -Requires(postun): /sbin/service -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -%endif %description HylaFAX(tm) is an enterprise-strength fax server supporting @@ -142,9 +93,7 @@ %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}" - +CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" \ STRIP=':' \ ./configure \ --with-DIR_BIN=%{_bindir} \ @@ -177,11 +126,7 @@ # install: make some dirs... 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 || 0%{?sles_version} >= 1200 mkdir -p -m 755 %{buildroot}%{_unitdir} -%endif - mkdir -p -m 755 %{buildroot}%{_initrddir} mkdir -p -m 755 %{buildroot}%{_bindir} mkdir -p -m 755 %{buildroot}%{_sbindir} @@ -207,34 +152,16 @@ MAN=%{buildroot}%{_mandir} \ INSTALL_ROOT=%{buildroot} -# install: remaining files -%if 0%{?fedora} >= 16 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%{?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}%{_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 %{_sbindir}/service %{buildroot}%{_sbindir}/rc$lnk done -%endif - -%if 0%{?sles_version} >= 1200 || 0%{?suse_version} >= 1210 - ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rchylafax -%endif +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rchylafax # not being executable is rather unconvenient chmod +x %{buildroot}%{_sbindir}/edit-faxcover @@ -246,35 +173,6 @@ rm -f %{buildroot}%{faxspool}/COPYRIGHT -%if 0%{?fedora} >= 16 -%post -/sbin/ldconfig -if [ 0$1 -eq 1 ]; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun -if [ 0$1 -eq 0 ]; then - /bin/systemctl --no-reload disable hylafax-hfaxd.service > /dev/null 2>&1 || : - /bin/systemctl stop hylafax-hfaxd.service > /dev/null 2>&1 || : - /bin/systemctl --no-reload disable hylafax-faxq.service > /dev/null 2>&1 || : - /bin/systemctl stop hylafax-faxq.service > /dev/null 2>&1 || : -fi - -%postun -/sbin/ldconfig -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -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 -%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 @@ -296,128 +194,84 @@ %service_del_postun hylafax-faxq.service %service_del_postun hylafax-faxgetty-ttyS0.service %service_del_postun hylafax-hfaxd.service -%endif -#####End Systemd-setings - -####SysV settings - -%if 0%{?sles_version} && 0%{?sles_version} < 1200 -%post -%{fillup_and_insserv %{name}} -/sbin/ldconfig -if [ 0$1 -eq 1 ]; then - /sbin/chkconfig --add hylafax+ -fi - -%preun -if [ $1 = 0 ] ; then -# exits with an error if hfax is not running -# %%{stop_on_removal %%{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 %{_sysconfdir}/rc.d/rc?.d/???%{name} - fi - /sbin/service %{name} stop >/dev/null 2>&1 || : -fi - -%postun -if [ "$1" = "1" ]; then -%{restart_on_update %{name}} -%insserv_cleanup -fi - -%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 %{_unitdir}/hylafax-faxq.service %{_unitdir}/hylafax-faxgetty-ttyS0.service %{_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* -%{_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 -%{_mandir}/man1/textfmt.1.gz +%{_mandir}/man5/hylafax-config.5f%{ext_man} +%{_mandir}/man5/doneq.5f%{ext_man} +%{_mandir}/man5/dialrules.5f%{ext_man} +%{_mandir}/man5/hosts.hfaxd.5f%{ext_man} +%{_mandir}/man5/hylafax-server.5f%{ext_man} +%{_mandir}/man5/hylafax-info.5f%{ext_man} +%{_mandir}/man5/hylafax-log.5f%{ext_man} +%{_mandir}/man5/pagermap.5f%{ext_man} +%{_mandir}/man5/pagesizes.5f%{ext_man} +%{_mandir}/man5/recvq.5f%{ext_man} +%{_mandir}/man5/sendq.5f%{ext_man} +%{_mandir}/man5/hylafax-shutdown.5f%{ext_man} +%{_mandir}/man5/status.5f%{ext_man} +%{_mandir}/man5/tsi.5f%{ext_man} +%{_mandir}/man5/typerules.5f%{ext_man} +%{_mandir}/man5/xferfaxlog.5f%{ext_man} +%{_mandir}/man8/choptest.8c%{ext_man} +%{_mandir}/man8/cqtest.8c%{ext_man} +%{_mandir}/man8/dialtest.8c%{ext_man} +%{_mandir}/man8/faxabort.8c%{ext_man} +%{_mandir}/man8/faxaddmodem.8c%{ext_man} +%{_mandir}/man8/faxadduser.8c%{ext_man} +%{_mandir}/man8/faxanswer.8c%{ext_man} +%{_mandir}/man8/faxconfig.8c%{ext_man} +%{_mandir}/man8/faxcron.8c%{ext_man} +%{_mandir}/man8/faxdeluser.8c%{ext_man} +%{_mandir}/man8/faxgetty.8c%{ext_man} +%{_mandir}/man8/faxinfo.8c%{ext_man} +%{_mandir}/man8/faxlock.8c%{ext_man} +%{_mandir}/man8/faxmodem.8c%{ext_man} +%{_mandir}/man8/faxq.8c%{ext_man} +%{_mandir}/man8/faxqclean.8c%{ext_man} +%{_mandir}/man8/faxquit.8c%{ext_man} +%{_mandir}/man8/faxrcvd.8c%{ext_man} +%{_mandir}/man8/faxsend.8c%{ext_man} +%{_mandir}/man8/faxsetup.8c%{ext_man} +%{_mandir}/man8/faxstate.8c%{ext_man} +%{_mandir}/man8/faxwatch.8c%{ext_man} +%{_mandir}/man8/hfaxd.8c%{ext_man} +%{_mandir}/man8/jobcontrol.8c%{ext_man} +%{_mandir}/man8/mkcover.8c%{ext_man} +%{_mandir}/man8/notify.8c%{ext_man} +%{_mandir}/man8/pagesend.8c%{ext_man} +%{_mandir}/man8/pollrcvd.8c%{ext_man} +%{_mandir}/man8/pdf2fax.8c%{ext_man} +%{_mandir}/man8/ps2fax.8c%{ext_man} +%{_mandir}/man8/recvstats.8c%{ext_man} +%{_mandir}/man8/tagtest.8c%{ext_man} +%{_mandir}/man8/tiff2fax.8c%{ext_man} +%{_mandir}/man8/tiffcheck.8c%{ext_man} +%{_mandir}/man8/tsitest.8c%{ext_man} +%{_mandir}/man8/wedged.8c%{ext_man} +%{_mandir}/man8/xferfaxstats.8c%{ext_man} +%{_mandir}/man8/faxfetch.8c%{ext_man} +%{_mandir}/man8/faxmsg.8c%{ext_man} +%{_mandir}/man8/faxsetup.linux.8c%{ext_man} +%{_mandir}/man8/hylafax.8c%{ext_man} +%{_mandir}/man8/lockname.8c%{ext_man} +%{_mandir}/man8/ondelay.8c%{ext_man} +%{_mandir}/man8/probemodem.8c%{ext_man} +%{_mandir}/man8/typetest.8c%{ext_man} +%{_mandir}/man1/textfmt.1%{ext_man} %dir %{_sysconfdir}/hylafax %dir %{_sysconfdir}/hylafax/faxmail %dir %{_sysconfdir}/hylafax/faxmail/application @@ -435,12 +289,6 @@ %{faxspool}%{_sysconfdir}/LiberationSans-25.pcf %config(noreplace) %{faxspool}%{_sysconfdir}/dialrules* %defattr(755,root,root,-) - -%if 0%{?fedora} < 16 || 0%{?sles_version} < 1210 -%{_initddir}/hylafax+ -#%%{_sbindir}/rchylafax+ -%endif - %config(noreplace) %{_sysconfdir}/cron.daily/hylafax %config(noreplace) %{_sysconfdir}/cron.hourly/hylafax %{_sbindir}/choptest @@ -520,11 +368,9 @@ %config(noreplace) %{faxspool}%{_sysconfdir}/hosts.hfaxd %files -n libfaxutil%{lib_version} -%defattr(-, root, root) %{_libdir}/libfaxutil* %files -n hylafax+-client -%defattr(-, root, root) %config(noreplace) %{_sysconfdir}/hylafax/faxcover.ps %config(noreplace) %{_sysconfdir}/hylafax/faxmail.ps %config(noreplace) %{_sysconfdir}/hylafax/pagesizes @@ -537,15 +383,15 @@ %{_bindir}/sendfax %{_bindir}/sendpage %{_sbindir}/edit-faxcover -%{_mandir}/man1/edit-faxcover.1.gz -%{_mandir}/man1/faxalter.1.gz -%{_mandir}/man1/faxcover.1.gz -%{_mandir}/man1/faxmail.1.gz -%{_mandir}/man1/faxrm.1.gz -%{_mandir}/man1/faxstat.1.gz -%{_mandir}/man1/hylafax-client.1.gz -%{_mandir}/man1/sendfax.1.gz -%{_mandir}/man1/sendpage.1.gz -%{_mandir}/man1/sgi2fax.1.gz +%{_mandir}/man1/edit-faxcover.1%{ext_man} +%{_mandir}/man1/faxalter.1%{ext_man} +%{_mandir}/man1/faxcover.1%{ext_man} +%{_mandir}/man1/faxmail.1%{ext_man} +%{_mandir}/man1/faxrm.1%{ext_man} +%{_mandir}/man1/faxstat.1%{ext_man} +%{_mandir}/man1/hylafax-client.1%{ext_man} +%{_mandir}/man1/sendfax.1%{ext_man} +%{_mandir}/man1/sendpage.1%{ext_man} +%{_mandir}/man1/sgi2fax.1%{ext_man} %changelog
