-
%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.20
-Release: 2
+Version: 1.2.2
+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: fb2b9d073cb6575c2d0020eda266ca0c
-URL: http://tomcat.apache.org/native-doc
+# Source0-md5: b942be2f6216142dd0dc42d69c54d148
+URL: http://tomcat.apache.org/native-doc/
BuildRequires: ant
BuildRequires: apr-devel
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: java-sun
+BuildRequires: jdk >= 1.7.0
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
+Requires: nss
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%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
%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
%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 \
# 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
%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