Author: rjung
Date: Sat Oct 31 12:09:41 2015
New Revision: 1711609
URL: http://svn.apache.org/viewvc?rev=1711609&view=rev
Log:
Try to fix apr version dependency expression
in tcnative RPM spec file.
Modified:
tomcat/native/trunk/native/build/rpm/tcnative.spec.in
Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=1711609&r1=1711608&r2=1711609&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Sat Oct 31 12:09:41
2015
@@ -16,7 +16,8 @@
#
%define tcnver 1
-%define aprver 1
+%define aprmajor 1
+%define aprminor 5
Summary: Tomcat Native Java library
Name: tcnative
@@ -27,8 +28,7 @@ Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# XXX The part "apr-devel >= 0:{version}-{release}" is probably wrong
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release},
openssl >= 1.0.2
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl >= 1.0.2
%description
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -38,8 +38,7 @@ contains additional utility interfaces f
%package devel
Group: Development/Libraries
Summary: Tomcat Native development kit
-# XXX The part "apr-devel >= 0:{version}-{release}" is probably wrong
-Requires: tcnative = %{version}-%{release}, apr-devel >=
0:{version}-{release}, openssl-devel >= 1.0.2
+Requires: tcnative = %{version}-%{release}, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl-devel >= 1.0.2
%description devel
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -51,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
@@ -88,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
