- updated to 1.1.24

[packages/tomcat-native.git] / tomcat-native.spec

diff --git a/tomcat-native.spec b/tomcat-native.spec
index e8268205ac357392be72181b2676f95b3fdc3468..95b5805c8242cdfacd511d0bf7046bafdfb6237c 100644 (file)
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -1,30 +1,28 @@
 
 %include       /usr/lib/rpm/macros.java
 
-%define                jarver  1.1.17
-
 Summary:       Native Tomcat Connector based on APR
 Summary(pl.UTF-8):     Natywny Connector Tomcata oparty o APR
 Name:          tomcat-native
-Version:       1.1.18
+Version:       1.1.24
 Release:       1
 License:       Apache v2
 Group:         Libraries
 Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz
-# Source0-md5: 03701be390f81198ca4531ab4b0a8f35
+# Source0-md5: cfd4762f2da19ba79d1b6a2a948c9d21
 URL:           http://tomcat.apache.org/native-doc
 BuildRequires: ant
 BuildRequires: apr-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: java-sun
+BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: libtool
 BuildRequires: openssl-devel
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
-ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664}
+BuildConflicts:        java-gcj-compat
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -105,8 +103,8 @@ rm -rf $RPM_BUILD_ROOT
 
 cd jni
 install -d $RPM_BUILD_ROOT/%{_javadir}
-install dist/tomcat-native-%{jarver}-dev.jar $RPM_BUILD_ROOT/%{_javadir}/tomcat-native-%{jarver}.jar
-ln -s tomcat-native-%{jarver}.jar $RPM_BUILD_ROOT/%{_javadir}/tomcat-native.jar
+install dist/tomcat-native-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/tomcat-native-%{version}.jar
+ln -s tomcat-native-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/tomcat-native.jar
 
 cd native
 %{__make} install \
@@ -125,8 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG.txt KEYS
-%{_javadir}/%{name}-%{jarver}.jar
+%doc CHANGELOG.txt KEYS README.txt
+%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %attr(755,root,root) %{_libdir}/libtcnative-1.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtcnative-1.so.0