SPECS: apache1.spec - add lingerd to initscript; lib64 fixes

glen glen at pld-linux.org
Tue Nov 29 01:29:11 CET 2005


Author: glen                         Date: Tue Nov 29 00:29:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add lingerd to initscript; lib64 fixes

---- Files affected:
SPECS:
   apache1.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.121 SPECS/apache1.spec:1.122
--- SPECS/apache1.spec:1.121	Tue Nov 29 01:11:03 2005
+++ SPECS/apache1.spec	Tue Nov 29 01:29:06 2005
@@ -32,7 +32,7 @@
 Summary(zh_CN):	Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ
 Name:		apache1
 Version:	1.3.34
-Release:	5.3
+Release:	5.4
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -1335,7 +1335,7 @@
 	root=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache1
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apache
+sed -e '%{?with_lingerd:s,/usr/lib,%{_libdir},g}' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/apache
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -1833,7 +1833,7 @@
 %dir %{_libexecdir}
 
 %if %{with lingerd}
-%{_libexecdir}/lingerd
+%attr(755,root,root) %{_libexecdir}/lingerd
 %attr(770,root,http) %dir %{_localstatedir}/run/lingerd
 %endif
 
@@ -2397,6 +2397,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2005/11/29 00:29:06  glen
+- add lingerd to initscript; lib64 fixes
+
 Revision 1.121  2005/11/29 00:11:03  glen
 - add lingerd patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.121&r2=1.122&f=u




More information about the pld-cvs-commit mailing list