Up to 1.2.31.

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

diff --git a/tomcat-native.spec b/tomcat-native.spec
index f904bf8994031542fb974edd5944deb7b1de8eb6..9cedd9ed388982874d2f6ec0c6a10ad821891bc0 100644 (file)
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -1,13 +1,12 @@
-%include       /usr/lib/rpm/macros.java
 Summary:       Native Tomcat Connector based on APR
 Summary(pl.UTF-8):     Natywny Connector Tomcata oparty o APR
 Name:          tomcat-native
-Version:       1.1.32
+Version:       1.2.31
 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: 90b4f55d9e3f3614c7b780500268570b
+# Source0-md5: a6943e123b1eca0795e106af132df93d
 URL:           http://tomcat.apache.org/native-doc/
 BuildRequires: ant
 BuildRequires: apr-devel
@@ -86,7 +85,6 @@ Statyczna biblioteka tcnative.
 
 %build
 # build java part
-cd jni
 %ant clean jar \
        -Dcompile.source=1.7 \
        -Dcompile.target=1.7 \
@@ -102,9 +100,8 @@ cd native
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd jni
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/tomcat-native-%{version}-dev.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-native-%{version}.jar
+cp -p 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
@@ -134,7 +131,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libtcnative-1.la
-%{_pkgconfigdir}/tcnative-1.pc
 %{_includedir}/*.h
 
 %files static