SPECS: hylafax.spec - adapter, cleanups - make -j1 - use %service ...
glen
glen at pld-linux.org
Fri Oct 13 09:22:01 CEST 2006
Author: glen Date: Fri Oct 13 07:22:01 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adapter, cleanups
- make -j1
- use %service
- no macro for external program path
- drop non-cvs changelog
---- Files affected:
SPECS:
hylafax.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/hylafax.spec
diff -u SPECS/hylafax.spec:1.46 SPECS/hylafax.spec:1.47
--- SPECS/hylafax.spec:1.46 Fri Oct 13 09:03:43 2006
+++ SPECS/hylafax.spec Fri Oct 13 09:21:56 2006
@@ -28,6 +28,7 @@
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
BuildRequires: libtiff-progs
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.1
BuildRequires: zlib-devel
Requires: %{name}-libs = %{version}-%{release}
@@ -66,8 +67,9 @@
Requires(post): textutils
Requires(post,preun): /sbin/chkconfig
Requires(preun): /sbin/telinit
-Requires(preun): sed >= 4.1
+Requires(preun): sed >= 4.0
Requires: %{name} = %{version}-%{release}
+Requires: rc-scripts
%description server
HylaFAX(tm) is a sophisticated enterprise-strength fax package for
@@ -164,7 +166,7 @@
--with-DIR_LIBDATA=%{_datadir}/fax \
--with-DIR_MAN=%{_mandir} \
--with-DIR_SPOOL=%{faxspool} \
- --with-PATH_GSRIP=%{_bindir}/gs \
+ --with-PATH_GSRIP=/usr/bin/gs \
--with-AFM=no \
--with-DSO=auto \
--with-PATH_VGETTY=/sbin/vgetty \
@@ -177,7 +179,7 @@
--with-SCRIPT_SH=/bin/bash \
--with-PATH_SENDMAIL=/usr/sbin/sendmail
-%{__make} \
+%{__make} -j1 \
OPTIMIZER="%{rpmcflags}"
%install
@@ -211,7 +213,7 @@
install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/hylafax
# defaults
-install defaults/* $RPM_BUILD_ROOT%{faxspool}/config/defaults/
+install defaults/* $RPM_BUILD_ROOT%{faxspool}/config/defaults
# hyla.conf
install %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/fax/hyla.conf
@@ -226,7 +228,7 @@
# dialrules extras
install dialrules_extras/dialrules* $RPM_BUILD_ROOT%{faxspool}/etc
-(cd $RPM_BUILD_ROOT%{faxspool}/bin; ln -sf ps2fax.gs ps2fax)
+ln -sf ps2fax.gs $RPM_BUILD_ROOT%{faxspool}/bin/ps2fax
# The Makefile puts the .so file in /usr/sbin. Move them to /usr/lib
#mv -f $RPM_BUILD_ROOT%{_sbindir}/*.so.* $RPM_BUILD_ROOT%{_libdir}
@@ -252,35 +254,31 @@
%postun libs -p /sbin/ldconfig
%if 0
-#%preun client
-#%_preun_service hylafax
-#
-#%post client
-#%_post_service hylafax
-#%%{_sbindir}/faxsetup -client
+%preun client
+%_preun_service hylafax
+
+%post client
+%_post_service hylafax
+%{_sbindir}/faxsetup -client
%endif
%post server
/sbin/chkconfig --add hylafax
-if [ -f /var/lock/subsys/hylafax ]; then
- /etc/rc.d/init.d/hylafax restart
-else
- echo "Run \"/etc/rc.d/init.d/hylafax start\" to start hylafax daemons." >&2
-fi
+%service hylafax restart
-cat /etc/inittab | grep -i "faxgetty entry" || \
-echo -e "# FaxGetty Entry\n#t0:23:respawn:%{_sbindir}/faxgetty ttyS0" >> /etc/inittab
-echo "Please check if new fax entry in /etc/inittab is correct."
-echo "Run \"%{_sbindir}/faxsetup -server\" to configure your fax server"
-echo "Run \"/sbin/telinit q\" to start faxgetty"
+if [ "$1" = 1 ]; then
+ grep -i "faxgetty entry" /etc/inittab || \
+ echo -e "# FaxGetty Entry\n#t0:23:respawn:%{_sbindir}/faxgetty ttyS0" >> /etc/inittab
+ echo "Please check if new fax entry in /etc/inittab is correct."
+ echo "Run \"%{_sbindir}/faxsetup -server\" to configure your fax server"
+ echo "Run \"/sbin/telinit q\" to start faxgetty"
+fi
%preun server
if [ "$1" = "0" ] ; then
- if [ -f /var/lock/subsys/hylafax ]; then
- /etc/rc.d/init.d/hylafax stop >&2
- fi
+ %service hylafax stop
/sbin/chkconfig --del hylafax
- sed -i -e 's!^.*faxgetty.*$!!' /etc/inittab
+ %{__sed} -i -e 's!^.*faxgetty.*$!!' /etc/inittab
/sbin/telinit q
fi
@@ -400,6 +398,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2006/10/13 07:21:56 glen
+- adapter, cleanups
+- make -j1
+- use %service
+- no macro for external program path
+- drop non-cvs changelog
+
Revision 1.46 2006/10/13 07:03:43 qboosh
- updated to 4.3.0.12
@@ -460,10 +465,10 @@
Revision 1.28 2003/09/16 01:53:37 pius
- release 0.2
-- fixed usage of %%{_sysconfdir}
-- changed libexec path to %%{_sbindir}
+- fixed usage of %{_sysconfdir}
+- changed libexec path to %{_sbindir}
- fixed hosts.hfaxd permissions
-- added missing binaries and other small fixes in %%files
+- added missing binaries and other small fixes in %files
Revision 1.27 2003/07/15 12:47:22 misi3k
- rel 0.1
@@ -488,7 +493,7 @@
- Release: 0.3
- new hyla.conf
- Req: ghostscript-fonts-std
-- changed perm. for %%{faxspool}/{client,bin}
+- changed perm. for %{faxspool}/{client,bin}
Revision 1.21 2003/03/20 15:54:45 misiek
- allow using new libtiff
@@ -509,7 +514,7 @@
- adapterized
Revision 1.15 2002/12/07 23:49:19 ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
Revision 1.14 2002/09/29 14:18:23 speedy
- fixed, release 0.2
@@ -529,7 +534,7 @@
Revision 1.9 2002/04/22 21:36:18 ankry
- added man pages from Debian
- removed sgi2fax (requires SGI libdl to build) references from man pages
-- set DIR_LIBEXEC=%%{_bindir} (as Debian do)
+- set DIR_LIBEXEC=%{_bindir} (as Debian do)
- release 0.3
Revision 1.8 2002/04/09 10:26:41 newrom
@@ -549,7 +554,7 @@
- todo: make it more FHS compiliant
Revision 1.4 2002/01/18 02:13:18 kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
Revision 1.3 2001/12/18 15:48:45 qboosh
- some fixes and cleanups; TODO: put proper perms to some files
@@ -560,191 +565,3 @@
Revision 1.1 2001/12/18 14:32:19 orzech
- stolen from MDK
- some basic fixes, NFY
-
-* Mon Aug 06 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-5mdk
-- add COPYRIGHT in %%libname{,devel}
-
-* Tue Jul 17 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-4mdk
-- clean %%preun (no need to do what %%_preun_service does)
-- Christian Zoffoli <czoffoli at linux-mandrake.com> did :
- - added hylafax-topmargin.patch
- - added hylafax-v4.1-priority.patch (BUG 153)
- - renamed & bzipped some patches
-
-* Wed Jul 11 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-3mdk
-- fix %%postun -p by removing next comment (rpm believed the comment
- was the shell to use :-( )
-- fix license
-
-* Tue Jul 10 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-2mdk
-- add some fixes from jeff
-
-* Tue Jul 10 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-1mdk
-- final release
-- various spec fixes
-- security patch has been merged
-
-* Sun Jul 01 2001 Stefan van der Eijk <stefan at eijk.nu> 4.1-0.14mdk
-- BuildRequires: zlib-devel
-
-* Wed Jun 06 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.13mdk
-- add a requires on libtiff3-progs for tiffcp (needed by faxsetup)
-
-* Sat May 19 2001 Christian Zoffoli <czoffoli at linux-mandrake.com> 4.1-0.12mdk
-- rings-cid-passing.patch
-
-* Sun Apr 15 2001 Christian Zoffoli <czoffoli at linux-mandrake.com> 4.1-0.11mdk
-- SECURITY PATCH: hfaxd-vulnerability.patch
-- server macros
-
-* Thu Mar 15 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.10mdk
-- dso fix from Christian Zoffoli
-
-* Thu Mar 08 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.9mdk
-- s!Requires: %%{libname}!Requires: %%{libname} = %{version}
-- remove useless {%%post|%%postun} -n %{libname}
-: simplify others {pre,post}-scripts
-- %%{_libdir}/lib*.so go in %%{libname}-devel
-- %%{_libdir}/lib*.so.* go in %%{libname}
-- %%{libname}-devel provides lib%%{name}-devel = %%{version}
-
-- move the explaination why we don't use %%make near make
-- decribe deeper christian work
-- Christian Zoffoli <czoffoli at linux-mandrake.com> :!
- * Conflicts: mgetty-sendfax
- * add Requires: %%{libname}
- * fix a typo in previous "typo fix" changelog
-
-* Tue Feb 27 2001 Christian Zoffoli <czoffoli at linux-mandrake.com> 4.1-0.8mdk
-- beta 3
-- fixed a typo
-
-* Fri Jan 26 2001 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.7mdk
-- from Christian Zoffoli <czoffoli at linux-mandrake.com>
- - cvs-20001203
- - many changes in spec
- - new init script
-
-* Thu Dec 07 2000 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.6mdk
-- new lib scheme
-- make rpmlint happier (remove ~30 errors and ~40 warning, ie 50% of all my
- packages errors and warnings)
-
-* Wed Nov 08 2000 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.5mdk
-- remove CVS garbage
-- uses optimizations
-
-* Wed Nov 08 2000 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.4mdk
-- build release
-
-* Mon Sep 18 2000 Guillaume Cottenceau <gc at mandrakesoft.com> 4.1-0.3mdk
-- remove duplicate installation of sysvinit script through configure/makefile
-- make it /var/lock/subsys compliant
-- use _initrddir
-
-* Mon Aug 07 2000 Frederic Lepied <flepied at mandrakesoft.com> 4.1-0.2mdk
-- automatically added BuildRequires
-
-* Fri Aug 04 2000 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.1-0.1mdk
-- Christian Zoffoli <czoffoli at linux-mandrake.com> :
- * cleaning in spec
- * added faxadduser faxdeluser
- * updated to cvs 20000801
- * changes in spec
- * new hylafax init script
-
-* Mon Jul 31 2000 Christian Zoffoli <czoffoli at linux-mandrake.com> 4.0pl2.rjc11-5mdk
-- removed group
-- fixed man (comp. with other distro)
-- fixed macros
-- changed permissions
-- fixed fonts
-- fixed doc / html install
-- spec restyling
-- added libtiff 3.5 support (patch tiff-3.5-interfaces.patch - adapted)
-- added posix-rename.patch
-- added cvtDateTime.patch
-- added tagline-patch (adapted)
-- fixed libtiff 3.5 test
-- added some dialrules
-- fixed ldconfig in main package (making rpmlint happier)
-
-* Wed Jul 19 2000 Thierry Vignaud <tvignaud at mandrakesoft.com> 4.0pl2.rjc11-4mdk
-- BM
-
-* Tue May 9 2000 Chmouel Boudjnah <chmouel at mandrakesoft.com> 4.0pl2.rjc11-3mdk
-- Add a lot of fixes from Christian Zoffoli <czoffoli at littlepenguin.org>.
-
-* Thu Apr 06 2000 Christopher Molnar <molnarc at mandrakesoft.com> 4.0pl2.rjc11-2mdk
- - changed group to Communications
- - bzipped patch files and additional source files
- - cleaned up spec file a bit
-
-* Tue Feb 22 2000 Brian J. Murrell <spec-maint at interlinx.bc.ca>4.0p12-1mdk
- - customized for Mandrake 7.0
- - split into common, client and server subpackages
- - use urw-fonts package instead of ghostscript-fonts
- - patch up to rjc11 from CVS
- - change --with-DIR_AFM to --with-FONTMAP while configuring
- - prompt the "yes" into configure
- - force make install to install the startup script for the server
- - modify to support a "DESTDIR" install
- - put execute permissions on the created shared libs
- - change the compress manpages code to be much simpler
- - have the %post for server and client either run or prompt faxsetup
- to be run
- - update URL pointer
-
-* Tue Sep 29 1998 Darren Nickerson <darren at info.tpc.int>
- - added security fix proposed by Carsten Hoeger <choeger at suse.de> for
- potential race condition reported by Tobias Richter
- <tsr at cave.isdn.cs.tu-berlin.de>
-* Wed Sep 9 1998 Darren Nickerson <darren at info.tpc.int>
- - built the RPM on Redhat-5.0 to avoid dependency problems with libjpeg
- and libstdc++.
-* Tue May 26 1998 Darren Nickerson <darren at info.tpc.int>
- - removed .orig files from patch - they were 90 percent of it
- - removed oversimplified /dev/modem assumptions
- - faxcron was invoking xferstats, instead of new xferfaxstats - fixed
- - revised faxcron's manpage
- - HylaFAX was still writing etc/xferlog. Changed to etc/xferfaxlog as
- advertised by all supporting docs and scripts.
- - added hourly faxqclean and daily faxcron cron jobs, and xferlog rotation
- - hfaxd no longer hard-wired as running from inetd, faxsetup will handle this
- - no longer assumes /dev/modem and blindly inserts inittab entry
- - change naming scheme to differentiate rh4/rh5
- - move documentation back into main rpm, instead of sub-packages
- - added Robert Colquhoun's textfmt-mailer patch
- - increased margin on LHS, was too close and getting clipped
- - make faxsetup warn that modem class = modem pool, not Class1/2/2.0
- - use HylaFAX's init script, startup with new protocol only and no snpp
- - added -DFIXEDMEDIA to last command in ps2fax.gs, as posted
- by "Alan Sparks" <asparks at nss.harris.com>
- - added fixhtml patch, removed release from the doc dir, now just version
- - added Nico's skel patch, for class1/2/2.0 modem prototype files
- - added Robert Colquhoun's patch to hfaxd's tagline generation
- - fixes to build on 5.1, contributed by Richard Sharpe <sharpe at ns.aus.com>
- - faxrcvd now treated as a config file, preserved as .rpmsave
- - fixed ghostscript dependency to require fonts-std, not fonts.
- - remove requirement for mawk - use gawk instead.
- - faxsetup now detects is hfaxd is not driven from inetd, and starts it
- when restarting faxq using SysV init script (Robert Colquhoun)
-
-
-* Wed Mar 04 1998 Markus Pilzecker <mp at rhein-neckar.netsurf.de>
- - took ldconfig call out ouf %install section
- - minimized and compressed patch
- - arch rpm buildable as ordinary user
- - diverted subpackages for [un]compressed man pages
- - diverted subpackage for html documentation
-
-* Thu Jan 22 1998 Bernd Johannes Wuebben <wuebben at kde.org>
- - hylafax-4.0-8
- - A previous version of this spec file was handed to me by
- Ramana Juvvadi (juvvadi at lekha.org)
- who unfortunately can no longer provide rpms of hylafax.
- Thanks so much for you work Ramana!
- Bernd
-
-* Fri Oct 24 1997 Ramana Juvvadi (juvvadi at lekha.org)
- - hylafax-4.0-6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/hylafax.spec?r1=1.46&r2=1.47&f=u
More information about the pld-cvs-commit
mailing list