- drop obsolete and outdated manual inclusion of rpm macros

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

diff --git a/tomcat-native.spec b/tomcat-native.spec
index 22deeabb4d721b1de3cfb676de1025fa3ba11314..485f03973d274ab60162a8a29861384f8546e7f0 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.29
-Release:       1
+Version:       1.2.10
+Release:       2
 License:       Apache v2
 Group:         Libraries
 Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz
-# Source0-md5: 98dd26555a600928238dd9f1d87b22da
+# Source0-md5: 7529a2240f1405f206d2c47dce2f5e6d
 URL:           http://tomcat.apache.org/native-doc/
 BuildRequires: ant
 BuildRequires: apr-devel
@@ -21,6 +20,7 @@ BuildRequires:        rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildConflicts:        java-gcj-compat
+Requires:      nss
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,7 +40,7 @@ platform rather than simply a backend focused technology.
 
 %description -l pl.UTF-8
 Tomcat może wykorzytać Apache Portable Runtime aby zapewnić najwyższą,
-saklowalność, wydajność i lepszą integrację z natywnymi technologiami
+skalowalność, wydajność i lepszą integrację z natywnymi technologiami
 serwerowymi.
 
 Apache portable Runtime jest wysoce przenośną biblioteką, która jest
@@ -85,8 +85,10 @@ Statyczna biblioteka tcnative.
 
 %build
 # build java part
-cd jni
-%ant clean jar
+%ant clean jar \
+       -Dcompile.source=1.7 \
+       -Dcompile.target=1.7 \
+       %{nil}
 
 # build native part
 cd native
@@ -98,7 +100,6 @@ cd native
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd jni
 install -d $RPM_BUILD_ROOT%{_javadir}
 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