Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Thu Apr 22 02:47:27 CEST 2010. -------- --- tomcat6/libtcnative-1-0.changes 2009-06-03 11:20:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/libtcnative-1-0.changes 2010-03-16 12:41:51.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 16 12:35:08 CET 2010 - ro@suse.de + +- build from tomcat-native-1.1.20-src.tar.gz +- package needs work, does not have to live in tomcat src any more + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tomcat-native-1.1.20-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.OY0aFB/_old 2010-04-22 02:47:13.000000000 +0200 +++ /var/tmp/diff_new_pack.OY0aFB/_new 2010-04-22 02:47:13.000000000 +0200 @@ -29,13 +29,13 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 3 +Release: 4 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. Url: http://tomcat.apache.org/tomcat-6.0-doc/apr.html -Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{tomcat_version}/src/%{packdname}.tar.bz2 -Source1: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 +Source0: tomcat-native-1.1.20-src.tar.gz +Source1: apr-1.3.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python BuildRequires: libapr1-devel @@ -88,15 +88,14 @@ %prep -%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version} -%setup -q -c -T -a 0 -a 1 -pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/native/connector +%setup -q -n tomcat-native-1.1.20-src -a 1 +pushd jni/native chmod a+x build/*.sh mv BUILDING README popd %build -pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} +pushd jni # remove pre-built binaries and windows files find . \( -name "*.bat" -o -name "*.class" -o -name "*.gz" -o \ -name "*.jar" -o -name "*.zip" \) | xargs -t %{__rm} -f @@ -104,8 +103,8 @@ # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK - pushd native/connector - sh buildconf --with-apr=../../../apr-%{version}/ + pushd native + sh buildconf --with-apr=../../apr-%{version}/ ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -115,7 +114,7 @@ popd %install -pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/native/connector +pushd jni/native make DESTDIR=${RPM_BUILD_ROOT} install %{__install} -d -m 755 ${RPM_BUILD_ROOT}/%{_includedir} %{__install} -m 644 include/* ${RPM_BUILD_ROOT}/%{_includedir} @@ -132,7 +131,7 @@ %files %defattr(-,root,root) %{_libdir}/%{libname}.so.* -%doc %{packdname}/native/connector/README +%doc jni/native/README %files devel %defattr(-,root,root) ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.OY0aFB/_old 2010-04-22 02:47:13.000000000 +0200 +++ /var/tmp/diff_new_pack.OY0aFB/_new 2010-04-22 02:47:13.000000000 +0200 @@ -41,7 +41,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1 +Release: 2 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org