- fix re-entrant install, make -j1, drop obsolete comment

[packages/LPRng.git] / LPRng.spec

diff --git a/LPRng.spec b/LPRng.spec
index 8a2e51c8508ad927c8f445bb6eb81b48ee75e275..79382c4ab7b4dbbeeca5b91248fbd59a97f1a0aa 100644 (file)
--- a/LPRng.spec
+++ b/LPRng.spec
@@ -5,12 +5,12 @@ Summary(ru):  
 Summary(uk):   óÐÕÌÅÒ ÄÒÕËÕ LPRng
 Summary(zh_CN):        LPRng--´òÓ¡³ÌÐò
 Name:          LPRng
-Version:       3.8.27
-Release:       1
+Version:       3.8.28
+Release:       2
 License:       GPL or Artistic
 Group:         Applications/System
 Source0:       ftp://ftp.lprng.com/pub/LPRng/LPRng/%{name}-%{version}.tgz
-# Source0-md5: 987006ed2bcb48b50772bdff4dfc3327
+# Source0-md5: 1b3a0abd291b260eab6087ac0e61ed84
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.printcap
@@ -28,12 +28,13 @@ BuildRequires:      automake
 BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: openssl-devel >= 0.9.7d
-PreReq:                rc-scripts >= 0.2.0
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post):        /sbin/ldconfig
 Requires(post,preun):  /sbin/chkconfig
-Obsoletes:     lpr
+Requires:      rc-scripts >= 0.2.0
 Obsoletes:     cups
 Obsoletes:     cups-clients
+Obsoletes:     lpr
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -162,6 +163,7 @@ Support 
 %patch5 -p1
 
 rm -rf autom4te.cache
+mv  PrintingCookbook/{HTML,PrintingCookbook}
 
 %build
 %{__gettextize}
@@ -183,7 +185,7 @@ cp -f /usr/share/automake/{config.*,missing} .
        --with-lpd_perms_path=%{_sysconfdir}/lpd.perms \
        --with-done_jobs=0
 
-%{__make}
+%{__make} -j1
 %{__make} -C man
 
 %install
@@ -200,14 +202,13 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_var}/spool/lpd/lp} \
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/lpd
 # yes, overwrite distribution lpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lpd.conf
-echo "default_printer = lp" >>$RPM_BUILD_ROOT%{_sysconfdir}/lpd.conf
+echo "default_printer = lp" >> $RPM_BUILD_ROOT%{_sysconfdir}/lpd.conf
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/printcap
 install lpd.perms $RPM_BUILD_ROOT%{_sysconfdir}
-# default spool
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-mv -f PrintingCookbook/{HTML,PrintingCookbook}
+rm -f $RPM_BUILD_ROOT%{_libdir}/liblpr.{la,a}
 
 %find_lang %{name}
 
@@ -217,18 +218,12 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lpd
-if [ -f /var/lock/subsys/lpd ]; then
-       /etc/rc.d/init.d/lpd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/lpd start\" to start LPRng lpd daemon."
-fi
+%service lpd restart "LPRng lpd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/lpd ]; then
-               /etc/rc.d/init.d/lpd stop 1>&2
-       fi
        /sbin/chkconfig --del lpd
+       %service lpd stop
 fi
 
 %postun -p /sbin/ldconfig
@@ -237,9 +232,9 @@ fi
 %defattr(644,root,root,755)
 %doc CHANGES CONTRIBUTORS COPYRIGHT README README.SSL* TODO
 %doc DOCS/LPRng-Reference-Multipart PrintingCookbook/PrintingCookbook
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/lpd.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/lpd.perms
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/printcap
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lpd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lpd.perms
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/printcap
 %dir %{_sysconfdir}/lpd
 # what perms?
 %attr(750,root,lp) %dir %{_sysconfdir}/lpd/ssl.ca