SPECS: apache-mod_jk.spec - fixed last commit message - fixed post...

[glen]

Author: glen                         Date: Wed Dec 28 14:15:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed last commit message
- fixed post script order
- remove not needed hacks

---- Files affected:
SPECS:
   apache-mod_jk.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_jk.spec
diff -u SPECS/apache-mod_jk.spec:1.32 SPECS/apache-mod_jk.spec:1.33
--- SPECS/apache-mod_jk.spec:1.32	Wed Dec 28 15:12:02 2005
+++ SPECS/apache-mod_jk.spec	Wed Dec 28 15:15:05 2005
@@ -16,7 +16,7 @@
 Patch0:		%{name}-libtool.patch
 URL:		http://tomcat.apache.org/connectors-doc/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel >= 2.2.0-6.1
+BuildRequires:	apache-devel >= 2.2.0-6.8
 BuildRequires:	apr-devel >= 1:1.0
 BuildRequires:	apr-util-devel >= 1:1.0
 BuildRequires:	autoconf
@@ -61,9 +61,7 @@
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/var/{lock/mod_jk,log/httpd}}
 
 %{__make} -C jk/native install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \
-	libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
 touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
@@ -72,14 +70,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
 if [ ! -f /var/log/httpd/mod_jk.log ]; then
 	umask 027
 	touch /var/log/httpd/mod_jk.log
 	chown root:logs /var/log/httpd/mod_jk.log
 fi
+if [ -f /var/lock/subsys/httpd ]; then
+	/etc/rc.d/init.d/httpd restart 1>&2
+fi
 
 %preun
 if [ "$1" = "0" ]; then
@@ -102,8 +100,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2005/12/28 14:15:05  glen
+- fixed last commit message
+- fixed post script order
+- remove not needed hacks
+
 Revision 1.32  2005/12/28 14:12:02  glen
-- rel 0.1
+- updated to 1.2.15; rel 0.1
 
 Revision 1.31  2005/12/26 23:59:19  glen
 - unified, build fixes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_jk.spec?r1=1.32&r2=1.33&f=u