diff --git a/.cvsignore b/.cvsignore index 976f3f3..c75f6b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -tomcat-native-1.1.12-src.tar.gz -tomcat-native-1.12-CHANGELOG.txt +tomcat-native-1.1.13-src.tar.gz diff --git a/sources b/sources index c550025..c3d7d15 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -7954b3fb31d4bec2617525b9977abf70 tomcat-native-1.1.12-src.tar.gz -04c99887f5c08ddd9b420cf7d6b0ba37 tomcat-native-1.12-CHANGELOG.txt +1bdf8b22eba97dc2f1fc25ed35a936cc tomcat-native-1.1.13-src.tar.gz diff --git a/tomcat-native-1.1.12-ifs.patch b/tomcat-native-1.1.12-ifs.patch deleted file mode 100644 index 256aaad..0000000 --- a/tomcat-native-1.1.12-ifs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up tomcat-native-1.1.12-src/jni/native/configure~ tomcat-native-1.1.12-src/jni/native/configure ---- tomcat-native-1.1.12-src/jni/native/configure~ 2007-12-21 16:06:53.000000000 +0200 -+++ tomcat-native-1.1.12-src/jni/native/configure 2008-02-12 21:55:42.000000000 +0200 -@@ -2490,7 +2490,7 @@ echo "$as_me: error: APR config could no - { (exit 1); exit 1; }; } - fi - sapr_version="`echo $sapr_pversion|sed -e 's/\(a-z*\)$/.\1/'`" -- IFS=.; set $sapr_version; IFS=' ' -+ tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS - if test "${1}" -lt "1"; then - { { echo "$as_me:$LINENO: error: You need APR version 1.2.1 or newer installed." >&5 - echo "$as_me: error: You need APR version 1.2.1 or newer installed." >&2;} diff --git a/tomcat-native.spec b/tomcat-native.spec index 64529c1..b389484 100644 --- a/tomcat-native.spec +++ b/tomcat-native.spec @@ -1,15 +1,12 @@ Name: tomcat-native -Version: 1.1.12 -Release: 2%{?dist} +Version: 1.1.13 +Release: 1%{?dist} Summary: Tomcat native library Group: System Environment/Libraries License: ASL 2.0 URL: http://tomcat.apache.org/tomcat-6.0-doc/apr.html Source0: http://archive.apache.org/dist/tomcat/tomcat-connectors/native/%{name}-%{version}-src.tar.gz -# Source1: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/CHANGELOG.txt?revision=605607 -Source1: %{name}-1.12-CHANGELOG.txt -Patch0: %{name}-1.1.12-ifs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: java-devel @@ -33,8 +30,6 @@ provides support for using APR in Tomcat. %prep %setup -q -n %{name}-%{version}-src -%patch0 -p1 -install -pm 644 %{SOURCE1} CHANGELOG.txt %build @@ -71,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 16 2008 Ville Skyttä - 1.1.13-1 +- 1.1.13. + * Tue Feb 12 2008 Ville Skyttä - 1.1.12-2 - Apply upstream fix to silence (seemingly harmless?) configure error spewage.