SPECS: apache-mod_jk.spec - use jpackage macros for java home; rel 1

glen glen at pld-linux.org
Sat Dec 8 19:22:18 CET 2007


Author: glen                         Date: Sat Dec  8 18:22:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use jpackage macros for java home; rel 1

---- Files affected:
SPECS:
   apache-mod_jk.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_jk.spec
diff -u SPECS/apache-mod_jk.spec:1.46 SPECS/apache-mod_jk.spec:1.47
--- SPECS/apache-mod_jk.spec:1.46	Mon Aug 20 02:02:47 2007
+++ SPECS/apache-mod_jk.spec	Sat Dec  8 19:22:12 2007
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem
 Name:		apache-mod_%{mod_name}
 Version:	1.2.25
-Release:	0.1
+Release:	1
 License:	Apache License 2.0
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
@@ -20,9 +20,10 @@
 BuildRequires:	apache-devel >= 2.2.0-6.8
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	jpackage-utils
 BuildRequires:	libtool
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	apache(modules-api) = %{apache_modules_api}
 Obsoletes:	apache-mod_jk2
 Obsoletes:	jakarta-tomcat-connectors-jk
@@ -54,7 +55,7 @@
 %{__autoconf}
 %configure \
 	--with-apxs=%{apxs} \
-	--with-java-home="${JAVA_HOME:-%{_libdir}/java}"
+	--with-java-home="%{java_home}"
 %{__make}
 
 %install
@@ -97,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2007-12-08 18:22:12  glen
+- use jpackage macros for java home; rel 1
+
 Revision 1.46  2007-08-20 00:02:47  glen
 - update to 1.2.25
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_jk.spec?r1=1.46&r2=1.47&f=u



More information about the pld-cvs-commit mailing list