X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftomcat-native.git;a=blobdiff_plain;f=tomcat-native.spec;h=9cedd9ed388982874d2f6ec0c6a10ad821891bc0;hp=ab2a2ea670ab4926c444e8eaa55b0980abac1af9;hb=HEAD;hpb=d5b2922e581ec17773df36befbe4976b2eda4993

diff --git a/tomcat-native.spec b/tomcat-native.spec
index ab2a2ea..9cedd9e 100644
--- a/tomcat-native.spec
+++ b/tomcat-native.spec
@@ -1,23 +1,18 @@
-
-%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.22
+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:	44d764f8d99d0454c7337ba9701558ee
-URL:		http://tomcat.apache.org/native-doc
+# Source0-md5:	a6943e123b1eca0795e106af132df93d
+URL:		http://tomcat.apache.org/native-doc/
 BuildRequires:	ant
 BuildRequires:	apr-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	jdk
+BuildRequires:	jdk >= 1.7.0
 BuildRequires:	jpackage-utils
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
@@ -25,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
@@ -44,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
@@ -89,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
@@ -102,11 +100,9 @@ cd native
 
 %install
 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 -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
 
 cd native
 %{__make} install \
@@ -115,7 +111,7 @@ cd native
 
 # Why Makefile doesn't do that?
 install -d $RPM_BUILD_ROOT/%{_includedir}
-install include/*.h $RPM_BUILD_ROOT/%{_includedir}
+cp -p include/*.h $RPM_BUILD_ROOT/%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,8 +121,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG.txt KEYS README.txt
-%{_javadir}/%{name}-%{jarver}.jar
+%doc CHANGELOG.txt 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
@@ -135,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