From eb0d1af69f9e4616e9fca60e41a6e177674c8c51 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sep 17 2013 20:09:49 +0000 Subject: Update to 1.1.28. - Make buildable on EL5 again; min supported APR version lowered back to 1.2.1. --- diff --git a/sources b/sources index ef657ce..68b1327 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75cd36b381009d448a94c962085e1314 tomcat-native-1.1.27-src.tar.gz +ae85f03bed95795f93456504e5b268c9 tomcat-native-1.1.28-src.tar.gz diff --git a/tomcat-native.spec b/tomcat-native.spec index 3033ce5..3d45c80 100644 --- a/tomcat-native.spec +++ b/tomcat-native.spec @@ -1,15 +1,17 @@ Name: tomcat-native -Version: 1.1.27 -Release: 3%{?dist} +Version: 1.1.28 +Release: 1%{?dist} Summary: Tomcat native library +Group: System Environment/Libraries License: ASL 2.0 URL: http://tomcat.apache.org/tomcat-7.0-doc/apr.html Source0: http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel BuildRequires: jpackage-utils -BuildRequires: apr-devel >= 1.3.0 +BuildRequires: apr-devel >= 1.2.1 BuildRequires: openssl-devel # Upstream compatibility: Provides: tcnative = %{version}-%{release} @@ -42,24 +44,33 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%make_install -C jni/native +make -C jni/native install DESTDIR=$RPM_BUILD_ROOT # Perhaps a devel package sometime? Not for now; no headers are installed. rm -f $RPM_BUILD_ROOT%{_libdir}/libtcnative*.*a rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig +%clean +rm -rf $RPM_BUILD_ROOT + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files +%defattr(-,root,root,-) %doc CHANGELOG.txt LICENSE NOTICE TODO.txt # Note: unversioned *.so needed here due to how Tomcat loads the lib :( %{_libdir}/libtcnative*.so* %changelog +* Mon Sep 16 2013 Ville Skyttä - 1.1.28-1 +- Update to 1.1.28. +- Make buildable on EL5 again; min supported APR version lowered back to 1.2.1. + * Sun Aug 04 2013 Fedora Release Engineering - 1.1.27-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild