packages: tomcat-native/tomcat-native.spec - rewritten almost from scratch.

[pawelz]

Author: pawelz                       Date: Thu Aug 13 12:19:22 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rewritten almost from scratch.

---- Files affected:
packages/tomcat-native:
   tomcat-native.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/tomcat-native/tomcat-native.spec
diff -u packages/tomcat-native/tomcat-native.spec:1.1 packages/tomcat-native/tomcat-native.spec:1.2
--- packages/tomcat-native/tomcat-native.spec:1.1	Tue Jul 14 18:38:31 2009
+++ packages/tomcat-native/tomcat-native.spec	Thu Aug 13 14:19:16 2009
@@ -1,20 +1,35 @@
 # $Revision$, $Date$
+
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
+#
+%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.16
 Release:	0.1
-License:	Apache
+License:	Apache v2
 Group:		Libraries
 Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/native/%{version}/source/%{name}-%{version}-src.tar.gz
+# Source0-md5:	2d27f8cf0d87b92b57b2758dad48ff2d
 URL:		http://tomcat.apache.org/native-doc
-BuildRequires:	apr-util-devel
-BuildRequires:	jdk
+BuildRequires:	ant
+BuildRequires:	apr-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jpackage-utils
+BuildRequires:	libtool
 BuildRequires:	openssl-devel
-Requires:	apr
-Requires:	openssl
-Suggests:	jre
-Suggests:	tomcat
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,7 +48,6 @@
 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 serwerowymi.
@@ -61,37 +75,77 @@
 Header files for tcnative library
 
 %description devel -l pl.UTF-8
-Pliki nag¿ówkowe biblioteki tcnative
+Pliki nagłówkowe biblioteki tcnative
+
+%package static
+Summary:	Static tcnative library
+Summary(pl.UTF-8):	Statyczna biblioteka tcnative
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static tcnative library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka tcnative.
 
 %prep
-%setup -q -n %{name}-%{version}-src/jni/native
+%setup -q -n %{name}-%{version}-src
 
 %build
+# build java part
+cd jni
+%ant clean jar
+
+# build native part
+cd native
+./buildconf --with-apr=%{_datadir}/apr
 %configure \
-	--with-apr=%{_bindir} \
-	--with-java-home=%{java_home}\
-
+	--with-java-home=%{java_home} \
+	--with-apr=/usr
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/tcnative.exp
+cd jni
+install -d $RPM_BUILD_ROOT/%{_javadir}
+install dist/tomcat-native-1.0.0.jar $RPM_BUILD_ROOT/%{_javadir}/tomcat-native-1.0.0.jar
+ln -s tomcat-native-1.0.0.jar $RPM_BUILD_ROOT/%{_javadir}/tomcat-native.jar
+
+cd native
+%{__make} install \
+	prefix=%{_prefix} \
+	DESTDIR=$RPM_BUILD_ROOT
+
+# Why Makefile doesn't do that?
+install -d $RPM_BUILD_ROOT/%{_includedir}
+install include/*.h $RPM_BUILD_ROOT/%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-#%doc CHANGES LICENSE NOTICE
-%attr(755,root,root) %{_libdir}/libtcnative-1.so*
+%doc CHANGELOG.txt KEYS
+%{_javadir}/%{name}-1.0.0.jar
+%{_javadir}/%{name}.jar
+%attr(755,root,root) %{_libdir}/libtcnative-1.so.0.1.16
+%attr(755,root,root) %ghost %{_libdir}/libtcnative-1.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libtcnative-1.*a
+%{_libdir}/libtcnative-1.la
+%{_libdir}/libtcnative-1.so
 %{_pkgconfigdir}/tcnative-1.pc
+%{_includedir}/*.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libtcnative-1.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -99,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/08/13 12:19:16  pawelz
+- rewritten almost from scratch.
+
 Revision 1.1  2009/07/14 16:38:31  matik
 - initial, builds and works but needs review. rel 0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat-native/tomcat-native.spec?r1=1.1&r2=1.2&f=u