Hello community, here is the log from the commit of package tomcat_apparmor checked in at Fri Feb 1 01:36:58 CET 2008. -------- --- tomcat_apparmor/tomcat_apparmor.changes 2007-07-30 09:35:45.000000000 +0200 +++ tomcat_apparmor/tomcat_apparmor.changes 2008-01-31 18:23:46.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 18:23:30 CET 2008 - tschmidt@suse.de + +- fix build for tomcat6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat_apparmor.spec ++++++ --- /var/tmp/diff_new_pack.U18132/_old 2008-02-01 01:34:16.000000000 +0100 +++ /var/tmp/diff_new_pack.U18132/_new 2008-02-01 01:34:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomcat_apparmor (Version 2.0.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,25 +11,20 @@ # norootforbuild Name: tomcat_apparmor -%if ! %{?distro:1}0 - %define distro suse -%endif -%if %{distro} == "suse" -%define CATALINA_HOME /usr/share/tomcat55 -%endif +%define CATALINA_HOME /usr/share/tomcat6 %define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ %define JNI_SO libJNIChangeHat.so %define JAR_FILE changeHatValve.jar Summary: Tomcat 5 plugin for AppArmor change_hat Version: 2.0.2 -Release: 27 +Release: 108 Group: System/Libraries Source0: %{name}-%{version}-688.tar.gz License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build -URL: http://developer.novell.com/wiki/index.php/Novell_AppArmor -Prereq: tomcat55, servletapi5, libapparmor1 -BuildRequires: ant apparmor-docs java java2-devel-packages libapparmor-devel servletapi5 tomcat55 +Url: http://developer.novell.com/wiki/index.php/Novell_AppArmor +Requires: tomcat6, libapparmor1 +BuildRequires: ant apparmor-docs java-devel libapparmor-devel tomcat6 %description tomcat_apparmor - is a plugin for Apache Tomcat version 5.x that @@ -48,7 +43,6 @@ %setup -q %build -[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} ant -Dinstall_lib=%{_lib} -Dcatalina_home=%{CATALINA_HOME} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so %install @@ -61,7 +55,7 @@ %files %defattr(-,root,root) -%{CATALINA_HOME}/server/lib/%{JAR_FILE} +%{CATALINA_HOME}/lib/%{JAR_FILE} /%{_lib}/lib* /%{_libdir}/lib* %doc %attr(0644,root,root) %{APPARMOR_DOC_DIR}/README.tomcat_apparmor @@ -73,21 +67,23 @@ ldconfig %changelog -* Mon Jul 30 2007 - aj@suse.de +* Thu Jan 31 2008 tschmidt@suse.de +- fix build for tomcat6 +* Mon Jul 30 2007 aj@suse.de - Require libapparmor-devel. - Fix permissions of README file. -* Mon May 21 2007 - dreynolds@suse.de +* Tue May 22 2007 dreynolds@suse.de - Ported plugin to tomcat5.5: - Changes to logging interface - Changes to request pipeline -* Tue Jan 30 2007 - ro@suse.de +* Tue Jan 30 2007 ro@suse.de - remove self-provides -* Tue Nov 21 2006 - dbornkessel@suse.de +* Tue Nov 21 2006 dbornkessel@suse.de - fixed the lib path to JRE -* Tue Oct 17 2006 - dreynolds@suse.de +* Tue Oct 17 2006 dreynolds@suse.de - Remove whitepace indent on %%define of CATALINA_HOME in the spec file as it was not getting expanded by the build system with the indent. -* Tue Oct 17 2006 - dreynolds@suse.de +* Tue Oct 17 2006 dreynolds@suse.de - Updated the tarball to match the svn id for our repo. -* Mon Oct 16 2006 - dreynolds@suse.de +* Tue Oct 17 2006 dreynolds@suse.de - Initial revision. Tomcat apparmor plugin - FATE: 300507 ++++++ tomcat_apparmor-2.0.2-688.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0.2/build.xml new/tomcat_apparmor-2.0.2/build.xml --- old/tomcat_apparmor-2.0.2/build.xml 2007-05-21 22:59:34.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/build.xml 2008-01-31 17:59:10.000000000 +0100 @@ -4,8 +4,8 @@ <property name="jni_src" location="src/jni_src"/> <property name="build" location="build"/> <property name="install_root" location="/"/> - <property name="catalina_home" location="/usr/share/tomcat5"/> - <property name="lib" location="lib"/> + <property name="catalina_home" location="/usr/share/tomcat6"/> + <property name="lib" location="/usr/share/tomcat6/bin"/> <property name="install_lib" value="/lib"/> <property name="dist" location="dist"/> <property name="jarfile" location="${dist}/${ant.project.name}.jar"/> @@ -18,12 +18,12 @@ <include name="**/*.jar"/> </fileset> - <fileset id="tomcat.jars" dir="${catalina_home}/server/lib"> + <fileset id="tomcat.jars" dir="${catalina_home}/lib"> <include name="**/*.jar"/> - </fileset> - <fileset id="servlet.jars" dir="${catalina_home}/common/lib"> + </fileset> + <fileset id="servlet.jars" dir="${catalina_home}/lib"> <include name="**/*.jar"/> - </fileset> + </fileset> <path id="lib.path"> <fileset refid="lib.jars"/> @@ -80,9 +80,9 @@ </target> <target name="install_jar" depends="jni_so" description="Install jar file"> - <mkdir dir="${install_root}/${catalina_home}/server/lib/"/> - <copy file="${jarfile}" tofile="${install_root}/${catalina_home}/server/lib/${ant.project.name}.jar"/> - <chmod perm="644" file="${install_root}/${catalina_home}/server/lib/${ant.project.name}.jar"/> + <mkdir dir="${install_root}/${catalina_home}/lib/"/> + <copy file="${jarfile}" tofile="${install_root}/${catalina_home}/lib/${ant.project.name}.jar"/> + <chmod perm="644" file="${install_root}/${catalina_home}/lib/${ant.project.name}.jar"/> </target> <target name="clean" description="Remove build and dist directories"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0.2/tomcat_apparmor.spec new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec --- old/tomcat_apparmor-2.0.2/tomcat_apparmor.spec 2007-05-21 23:07:20.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -# $Id:$ -# ---------------------------------------------------------------------- -# Copyright (c) 2006 NOVELL (All rights reserved) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# ---------------------------------------------------------------------- -# norootforbuild - -# Check first to see if distro is already defined. - -%if ! %{?distro:1}0 - %define distro suse -%endif - -%if %{distro} == "suse" -%define CATALINA_HOME /usr/share/tomcat5 -%endif -%define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ -%define JNI_SO libJNIChangeHat.so -%define JAR_FILE changeHatValve.jar - - -Summary: Tomcat 5 plugin for AppArmor change_hat -Name: tomcat_apparmor -Version: 2.0.2 -Release: 688 -Group: System/Libraries -Source0: %{name}-%{version}-688.tar.gz -License: LGPL -BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build -Url: http://developer.novell.com/wiki/index.php/Novell_AppArmor -Prereq: tomcat55, servletapi5, libapparmor -BuildRequires: tomcat55, servletapi5, ant, java, libapparmor, java2-devel-packages, apparmor-docs - -%description -tomcat_apparmor - is a plugin for Apache Tomcat version 5.x that provides -support for AppArmor change_hat for creating AppArmor containers that are -bound to discrete elements of processing within the Tomcat servlet -container. The AppArmor containers, or "hats", can be created for invidual -URL processing or per servlet. - -%prep - -%setup -q - -%build -[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} - -ant -Dinstall_lib=%{_lib} -Dcatalina_home=%{CATALINA_HOME} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so - -%install -ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dversion=%{version} -Drelease=%{release} -Dcatalina_home=%{CATALINA_HOME} -Dinstall_root=${RPM_BUILD_ROOT} -Dinstall_lib=%{_lib} install_jar install_jni - -mkdir -p ${RPM_BUILD_ROOT}%{APPARMOR_DOC_DIR} -install ${RPM_BUILD_DIR}/%{name}-%{version}/README.tomcat_apparmor ${RPM_BUILD_ROOT}%{APPARMOR_DOC_DIR} - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%{CATALINA_HOME}/server/lib/%{JAR_FILE} -/%{_lib}/lib* -/%{_libdir}/lib* -%{APPARMOR_DOC_DIR}/README.tomcat_apparmor - -%post -ldconfig - -%postun -ldconfig - -%changelog -* Mon Oct 9 2006 - dreynolds@suse.de -- Initial package creation. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomcat_apparmor-2.0.2/tomcat_apparmor.spec.in new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec.in --- old/tomcat_apparmor-2.0.2/tomcat_apparmor.spec.in 2007-05-21 22:59:34.000000000 +0200 +++ new/tomcat_apparmor-2.0.2/tomcat_apparmor.spec.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -# $Id:$ -# ---------------------------------------------------------------------- -# Copyright (c) 2006 NOVELL (All rights reserved) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# ---------------------------------------------------------------------- -# norootforbuild - -# Check first to see if distro is already defined. - -%if ! %{?distro:1}0 - %define distro suse -%endif - -%if %{distro} == "suse" -%define CATALINA_HOME /usr/share/tomcat5 -%endif -%define APPARMOR_DOC_DIR /usr/share/doc/packages/apparmor-docs/ -%define JNI_SO libJNIChangeHat.so -%define JAR_FILE changeHatValve.jar - - -Summary: Tomcat 5 plugin for AppArmor change_hat -Name: tomcat_apparmor -Version: @@immunix_version@@ -Release: @@repo_version@@ -Group: System/Libraries -Source0: %{name}-%{version}-@@repo_version@@.tar.gz -License: LGPL -BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build -Url: http://developer.novell.com/wiki/index.php/Novell_AppArmor -Prereq: tomcat55, servletapi5, libapparmor -BuildRequires: tomcat55, servletapi5, ant, java, libapparmor, java2-devel-packages, apparmor-docs - -%description -tomcat_apparmor - is a plugin for Apache Tomcat version 5.x that provides -support for AppArmor change_hat for creating AppArmor containers that are -bound to discrete elements of processing within the Tomcat servlet -container. The AppArmor containers, or "hats", can be created for invidual -URL processing or per servlet. - -%prep - -%setup -q - -%build -[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT} - -ant -Dinstall_lib=%{_lib} -Dcatalina_home=%{CATALINA_HOME} -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dtarget=1.4 jar jni_so - -%install -ant -Ddist=${RPM_BUILD_DIR}/%{name}-%{version} -Dversion=%{version} -Drelease=%{release} -Dcatalina_home=%{CATALINA_HOME} -Dinstall_root=${RPM_BUILD_ROOT} -Dinstall_lib=%{_lib} install_jar install_jni - -mkdir -p ${RPM_BUILD_ROOT}%{APPARMOR_DOC_DIR} -install ${RPM_BUILD_DIR}/%{name}-%{version}/README.tomcat_apparmor ${RPM_BUILD_ROOT}%{APPARMOR_DOC_DIR} - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%{CATALINA_HOME}/server/lib/%{JAR_FILE} -/%{_lib}/lib* -/%{_libdir}/lib* -%{APPARMOR_DOC_DIR}/README.tomcat_apparmor - -%post -ldconfig - -%postun -ldconfig - -%changelog -* Mon Oct 9 2006 - dreynolds@suse.de -- Initial package creation. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org