Author: rjung
Date: Sat Oct 31 12:11:40 2015
New Revision: 1711610
URL: http://svn.apache.org/viewvc?rev=1711610&view=rev
Log:
Try to fix apr version dependency expression
in tcnative RPM spec file.
Backport of r1711609 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 31 12:11:40 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in?rev=1711610&r1=1711609&r2=1711610&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Sat Oct 31
12:11:40 2015
@@ -16,7 +16,8 @@
#
%define tcnver 1
-%define aprver 1
+%define aprmajor 1
+%define aprminor 3
Summary: Tomcat Native Java library
Name: tcnative
@@ -27,7 +28,7 @@ Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release},
openssl >= 0.9.8
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl >= 0.9.8
%description
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -37,7 +38,7 @@ contains additional utility interfaces f
%package devel
Group: Development/Libraries
Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >=
0:{version}-{release}, openssl-devel >= 0.9.8
+Requires: tcnative = %{version}-%{release}, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl-devel >= 0.9.8
%description devel
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -49,7 +50,7 @@ contains additional utility interfaces f
%build
%configure --with-apr=%{_prefix} \
- --includedir=%{_includedir}/apr-%{aprver}
+ --includedir=%{_includedir}/apr-%{aprmajor}
make %{?_smp_mflags} && make dox
%check
@@ -86,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libtcnative-%{tcnver}.*a
%{_libdir}/libtcnative-%{tcnver}.so
%{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{aprver}/*.h
+%{_includedir}/apr-%{aprmajor}/*.h
%doc --parents html
%changelog
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
