robert pushed to hylafax+ (el6). "- allow the package building for RHEL >= 7 with systemd support (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun May 10 01:49:16 UTC 2015 

From f760b9e19908180d557047843c1edeaa7586547e Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Sun, 22 Feb 2015 03:41:43 +0100
Subject: - allow the package building for RHEL >= 7 with systemd support -
 build using lcms2 on all Fedora branches and also RHEL >= 7 - add build
 requirements to sendmail(1), ghostscript and mgetty - correct wrong day of
 the week in %changelog to silence rpm - correct permissions of
 %{_sysconfdir}/sysconfig/hylafax+ file


diff --git a/hylafax+.spec b/hylafax+.spec
index e1e759a..b29223d 100644
--- a/hylafax+.spec
+++ b/hylafax+.spec
@@ -4,7 +4,7 @@
 Summary:   An enterprise-strength fax server
 Name:      hylafax+
 Version:   5.5.5
-Release:   4%{?dist}
+Release:   5%{?dist}
 License:   libtiff and BSD with advertising
 Group:     Applications/Communications
 URL:       http://hylafax.sourceforge.net
@@ -22,24 +22,30 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:    hylafax = %{version}-%{release}
 Requires:    %{name}-client%{?_isa} = %{version}-%{release}
 
-BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, pam-devel, openldap-devel, lcms-devel, uucp, /usr/bin/tiffcp
-%if 0%{?fedora} >= 16
+BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, pam-devel, openldap-devel, uucp, %{_bindir}/tiffcp
+BuildRequires: %{_sbindir}/sendmail, ghostscript, ghostscript-fonts, mgetty
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 BuildRequires: jbigkit-devel
 %endif
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires: lcms2-devel
+%else
+BuildRequires: lcms-devel
+%endif
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 BuildRequires: systemd-units
 %endif
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires: systemd
 %endif
-Requires:    ghostscript, ghostscript-fonts, uucp, gawk, sharutils, mailx, crontabs, /usr/bin/tiffcp
+Requires:    ghostscript, ghostscript-fonts, uucp, gawk, sharutils, mailx, crontabs, %{_bindir}/tiffcp, mgetty
 Conflicts:   mgetty-sendfax
 Obsoletes:   hylafax < 5.5.2-1
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -63,6 +69,7 @@ Summary:     Client programs for HylaFAX fax servers
 Provides:    hylafax-client = %{version}-%{release}
 Obsoletes:   hylafax-client < 5.5.2-1
 Group:       Applications/Communications
+Requires:    %{_sbindir}/sendmail
 
 %description client
 HylaFAX(tm) is a enterprise-strength fax server supporting
@@ -109,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 # install: make some dirs...
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/{cron.daily,cron.hourly} 
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/{hylafax,sysconfig}
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_unitdir}
 %else
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_initrddir}
@@ -139,7 +146,7 @@ make install -e \
         INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # install: remaining files
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/hylafax-hfaxd.service
 install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/hylafax-faxq.service
 %else
@@ -161,7 +168,7 @@ rm -f $RPM_BUILD_ROOT%{faxspool}/COPYRIGHT
 rm -rf $RPM_BUILD_ROOT
 
 
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 %post
 /sbin/ldconfig
 if [ 0$1 -eq 1 ]; then
@@ -214,9 +221,11 @@ fi
 %endif
 
 %files
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 %{_unitdir}/hylafax-hfaxd.service
 %{_unitdir}/hylafax-faxq.service
+%else
+%{_initrddir}/hylafax+
 %endif
 %doc CHANGES CONTRIBUTORS COPYRIGHT README TODO VERSION
 %{_libdir}/libfaxserver*
@@ -278,13 +287,10 @@ fi
 %{faxspool}/etc/cover.templ
 %{faxspool}/etc/lutRS18.pcf
 %{faxspool}/etc/LiberationSans-25.pcf
+%config(noreplace) %{_sysconfdir}/sysconfig/hylafax+
 %defattr(755,root,root,-)
-%if 0%{?fedora} < 16
-%{_initrddir}/hylafax+
-%endif
 %{_sysconfdir}/cron.daily/hylafax+
 %{_sysconfdir}/cron.hourly/hylafax+
-%config(noreplace) %{_sysconfdir}/sysconfig/hylafax+
 %{_sbindir}/choptest
 %{_sbindir}/cqtest
 %{_sbindir}/faxabort
@@ -393,6 +399,13 @@ fi
 %dir %{faxspool}/etc
 
 %changelog
+* Sun Feb 22 2015 Robert Scheck <robert at fedoraproject.org> 5.5.5-5
+- allow the package building for RHEL >= 7 with systemd support
+- build using lcms2 on all Fedora branches and also RHEL >= 7
+- add build requirements to sendmail(1), ghostscript and mgetty
+- correct wrong day of the week in %%changelog to silence rpm
+- correct permissions of %%{_sysconfdir}/sysconfig/hylafax+ file
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -460,7 +473,7 @@ fi
 * Mon Dec 3 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-4
 - add missing man pages
 
-* Thu Nov 4 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-3
+* Sun Nov 4 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-3
 - spec optimizations
 - clarify linkage in libfaxserver
 - add systemd support
@@ -472,13 +485,13 @@ fi
 * Sat Oct 13 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.2-1
 - update to 5.5.2
 
-* Mon Jan 12 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.1-1
+* Thu Jan 12 2012 Lee Howard <faxguy at howardsilvan.com> - 5.5.1-1
 - update to 5.5.1
 
 * Sat Dec 18 2010 Lee Howard <faxguy at howardsilvan.com> - 5.5.0-1
 - update to 5.5.0
 
-* Sun Oct 13 2010 Lee Howard <faxguy at howardsilvan.com> - 5.4.3-1
+* Wed Oct 13 2010 Lee Howard <faxguy at howardsilvan.com> - 5.4.3-1
 - update to 5.4.3
 
 * Sun May 2 2010 Lee Howard <faxguy at howardsilvan.com> - 5.4.2-1
@@ -487,11 +500,11 @@ fi
 * Mon Feb 22 2010 Lee Howard <faxguy at howardsilvan.com> - 5.4.1-1
 - update to 5.4.1
 
-* Tue Dec 23 2009 Lee Howard <faxguy at howardsilvan.com> - 5.4.0-1
+* Wed Dec 23 2009 Lee Howard <faxguy at howardsilvan.com> - 5.4.0-1
 - update to 5.4.0
 - add lcms-devel build dependency
 
-* Mon Oct 25 2009 Lee Howard <faxguy at howardsilvan.com> - 5.3.0-1
+* Sun Oct 25 2009 Lee Howard <faxguy at howardsilvan.com> - 5.3.0-1
 - update to 5.3.0
 
 * Sat Feb 28 2009 Lee Howard <faxguy at howardsilvan.com> - 5.2.9-1
@@ -534,7 +547,7 @@ fi
 * Thu Jan 11 2007 Lee Howard <faxguy at howardsilvan.com> - 5.0.4-1
 - update to 5.0.4
 
-* Tue Jan 1 2007 Lee Howard <faxguy at howardsilvan.com> - 5.0.3-1
+* Mon Jan 1 2007 Lee Howard <faxguy at howardsilvan.com> - 5.0.3-1
 - update to 5.0.3
 
 * Wed Dec 13 2006 Lee Howard <faxguy at howardsilvan.com> - 5.0.2-1
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/hylafax+.git/commit/?h=el6&id=f760b9e19908180d557047843c1edeaa7586547e

More information about the scm-commits mailing list