[tomcat: 15/66] Add maven metadata and copy tomcat-juli.jar into /usr/share/java/tomcat6
by Ivan Afonichev
commit 2ed3aec4c697aa19531e2b702490050b06ebc097
Author: mef <mef(a)fedoraproject.org>
Date: Fri Mar 26 17:07:32 2010 +0000
Add maven metadata and copy tomcat-juli.jar into /usr/share/java/tomcat6
tomcat6.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index fe474e0..5289d57 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -95,6 +95,8 @@ Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(post): /lib/lsb/init-functions
Requires(preun): /lib/lsb/init-functions
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
%description
Tomcat is the servlet container that is used in the official Reference
@@ -258,6 +260,8 @@ pushd %{packdname}/output/build
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
+ # Put the juli jar under /usr/share/java/ too
+ %{__cp} -a bin/tomcat-juli*.jar ${RPM_BUILD_ROOT}%{libdir}
%{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
popd
# javadoc
@@ -333,6 +337,43 @@ pushd ${RPM_BUILD_ROOT}%{appdir}/sample
popd
%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
+# Install the maven metadata
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
+pushd %{packdname}/output/dist/src/res/maven
+for file in *.pom; do
+ base=`basename $file .pom`
+ # Some POMs don't actually have corresponding jar files in the current RPM
+ if [ $base != 'dbcp' -a $base != 'juli-adapters' -a $base != 'juli-extras' ]
+ then
+ sed -i 's/@MAVEN.DEPLOY.VERSION(a)/%{version}/g' $file
+ %{__cp} -a $file ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$file
+ # Some jar files have tomcat6 prepended and some don't, and some have their
+ # canonical home outside of the tomcat6 subdirectory
+ jppdir="JPP/%{name}"
+ if [ $base = 'coyote' -o $base = 'jsp-api' -o $base = 'servlet-api' ]; then
+ jpp="%{name}-$base"
+ jppdir="JPP"
+ else
+ if [ $base = 'tribes' ]; then
+ jpp=catalina-$base
+ else
+ if [ $base = 'juli' -o $base = 'coyote' ]; then
+ jpp=tomcat-$base
+ else
+ jpp=$base
+ fi
+ fi
+ fi
+
+ if [ $base = 'jasper-jdt' ]; then
+ %add_to_maven_depmap org.apache.tomcat $base %{version} JPP ecj 3.4.2
+ else
+ %add_to_maven_depmap org.apache.tomcat $base %{version} $jppdir $jpp %{version}
+ fi
+ fi
+done
+
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -345,6 +386,7 @@ popd
%post
# install but don't activate
/sbin/chkconfig --add %{name}
+%update_maven_depmap
%post jsp-%{jspspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
@@ -380,6 +422,9 @@ if [ "$1" = "0" ]; then
%{libdir}/\[ecj\].jar >/dev/null 2>&1
fi
+%postun
+%update_maven_depmap
+
%postun jsp-%{jspspec}-api
if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove jsp \
@@ -419,6 +464,10 @@ fi
%attr(0775,root,tomcat) %dir %{tempdir}
%attr(0775,root,tomcat) %dir %{workdir}
%{homedir}
+%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*.pom
+# Exclude the POMs that are in sub-packages
+%exclude %{_mavenpomdir}/*api*
%files admin-webapps
%defattr(0644,root,root,0755)
@@ -436,6 +485,7 @@ fi
%files jsp-%{jspspec}-api
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-jsp*.jar
+%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
%files lib
%defattr(0644,root,root,0755)
@@ -444,6 +494,7 @@ fi
%files servlet-%{servletspec}-api
%defattr(0644,root,root,0755)
%{_javadir}/%{name}-servlet*.jar
+%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files webapps
%defattr(0644,root,root,0755)
@@ -452,6 +503,10 @@ fi
%{appdir}/sample
%changelog
+* Fri Mar 26 2010 Mary Ellen Foster <mefoster(a)gmail.com> 0:6.0.24-2
+- Add maven POMs and metadata
+- Copy tomcat6-juli into /usr/share/java/tomcat6
+
* Mon Mar 1 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.24-1
- Update to 6.0.24.
12 years, 12 months
[tomcat: 14/66] Update to 6.0.24.
by Ivan Afonichev
commit 3652da78293d8c5c1ba37fb1f9c26c8f5f14c395
Author: Alexander Kurtakov <akurtakov(a)fedoraproject.org>
Date: Mon Mar 1 14:44:21 2010 +0000
Update to 6.0.24.
.cvsignore | 1 +
jsp-api-OSGi-MANIFEST.MF | 13 +++++++++++++
sources | 2 +-
tomcat6-6.0-bootstrap-MANIFEST.MF.patch | 7 ++++---
tomcat6.spec | 15 ++++++++++++---
5 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 0d3513f..ddf7ad7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
apache-tomcat-6.0.18-src.tar.gz
apache-tomcat-6.0.20-src.tar.gz
+apache-tomcat-6.0.24-src.tar.gz
diff --git a/jsp-api-OSGi-MANIFEST.MF b/jsp-api-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..d5ecf7e
--- /dev/null
+++ b/jsp-api-OSGi-MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-Vendor: %bundleProvider
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Name: %bundleName
+Bundle-SymbolicName: javax.servlet.jsp
+Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
+ ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
+ .tagext; version=2.0
+Bundle-Version: 2.0.0.v200806031607
+Bundle-ManifestVersion: 2
+Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
+ =2.4,javax.servlet.resources; version=2.4
diff --git a/sources b/sources
index 2621202..27e80a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44f49e7e14028b6a53c3c346bd18c72f apache-tomcat-6.0.20-src.tar.gz
+543218290008e0dd6a329f69136973ca apache-tomcat-6.0.24-src.tar.gz
diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
index 7b278dc..85ee302 100644
--- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
@@ -1,8 +1,9 @@
---- res/bootstrap.jar.manifest.orig 2007-06-21 11:02:18.000000000 -0400
-+++ res/bootstrap.jar.manifest 2007-06-21 11:02:26.000000000 -0400
+--- res/META-INF/bootstrap.jar.manifest.orig 2010-01-19 15:43:41.000000000 +0200
++++ res/META-INF/bootstrap.jar.manifest 2010-03-01 12:42:57.993559599 +0200
@@ -1,5 +1,4 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
+-Class-Path: commons-daemon.jar tomcat-juli.jar
Specification-Title: Catalina
Specification-Version: 6.0
+\ No newline at end of file
diff --git a/tomcat6.spec b/tomcat6.spec
index df04f65..fe474e0 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -33,7 +33,7 @@
%define jspspec 2.1
%define major_version 6
%define minor_version 0
-%define micro_version 20
+%define micro_version 24
%define packdname apache-tomcat-%{version}-src
%define servletspec 2.5
%define tcuid 91
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -69,6 +69,7 @@ Source5: %{name}-%{major_version}.%{minor_version}.logrotate
Source6: %{name}-%{major_version}.%{minor_version}-digest.script
Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
Source8: servlet-api-OSGi-MANIFEST.MF
+Source9: jsp-api-OSGi-MANIFEST.MF
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -230,6 +231,9 @@ mkdir -p META-INF
cp -p %{SOURCE8} META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
%install
%{__rm} -rf $RPM_BUILD_ROOT
@@ -355,7 +359,9 @@ popd
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
%post webapps
-%{_bindir}/build-jar-repository %{appdir}/examples/WEB-INF/lib \
+# need to use -p here with b-j-r otherwise the examples webapp fails to
+# load with a java.io.IOException
+%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
taglibs-core.jar taglibs-standard.jar 2>&1
%preun
@@ -446,6 +452,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Mar 1 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.24-1
+- Update to 6.0.24.
+
* Tue Dec 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.20-2
- Drop file requires on /usr/share/java/ecj.jar.
12 years, 12 months
[tomcat: 13/66] Drop file requires on /usr/share/java/ecj.jar.
by Ivan Afonichev
commit 82d42b11449a4e8cb6899832eb3fe081cb2b94d7
Author: Alexander Kurtakov <akurtakov(a)fedoraproject.org>
Date: Tue Dec 22 10:19:57 2009 +0000
Drop file requires on /usr/share/java/ecj.jar.
tomcat6.spec | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 365d0f6..df04f65 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -146,7 +146,6 @@ Summary: Libraries needed to run the Tomcat Web container
Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires(post): ecj
-Requires(post): %{_javadir}/ecj.jar
Requires(post): jakarta-commons-collections-tomcat5
Requires(post): jakarta-commons-dbcp-tomcat5
Requires(post): jakarta-commons-pool-tomcat5
@@ -447,6 +446,9 @@ fi
%{appdir}/sample
%changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.20-2
+- Drop file requires on /usr/share/java/ecj.jar.
+
* Mon Nov 9 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.20-1
- Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580.
12 years, 12 months
[tomcat: 12/66] Fix typo that causes a failure to update the common directory. (releng #2781)
by Ivan Afonichev
commit 107267ad97bbf071d77496383396291e36cbddcf
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 22:52:24 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index 35e4a57..e83f26f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := tomcat6
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
12 years, 12 months
[tomcat: 11/66] Update to 6.0.20. Fixes CVE-2009-0033, CVE-2009-0580.
by Ivan Afonichev
commit 13cd2e8dd257050a2cc0d5dbdc0fa968404cdfdd
Author: Alexander Kurtakov <akurtakov(a)fedoraproject.org>
Date: Mon Nov 9 20:31:26 2009 +0000
Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580.
.cvsignore | 1 +
sources | 2 +-
tomcat6-6.0-bootstrap-MANIFEST.MF.patch | 2 +-
tomcat6.spec | 9 ++++++---
4 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 6565d01..0d3513f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
apache-tomcat-6.0.18-src.tar.gz
+apache-tomcat-6.0.20-src.tar.gz
diff --git a/sources b/sources
index a967ad7..2621202 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9bdbb1c1d79302c80057a70b18fe6721 apache-tomcat-6.0.18-src.tar.gz
+44f49e7e14028b6a53c3c346bd18c72f apache-tomcat-6.0.20-src.tar.gz
diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
index e0651b4..7b278dc 100644
--- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
@@ -3,6 +3,6 @@
@@ -1,5 +1,4 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
--Class-Path: commons-daemon.jar commons-logging-api.jar tomcat-juli.jar tomcat-coyote.jar
+-Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar
Specification-Title: Catalina
Specification-Version: 6.0
diff --git a/tomcat6.spec b/tomcat6.spec
index 61c8ca9..365d0f6 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -33,7 +33,7 @@
%define jspspec 2.1
%define major_version 6
%define minor_version 0
-%define micro_version 18
+%define micro_version 20
%define packdname apache-tomcat-%{version}-src
%define servletspec 2.5
%define tcuid 91
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 10.2%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -447,10 +447,13 @@ fi
%{appdir}/sample
%changelog
+* Mon Nov 9 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.20-1
+- Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-10.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Wed Apr 1 2009 akurtakov <akurtakov(a)dhcp-lab-180.englab.brq.redhat.com> 0:6.0.18-9.2
+* Wed Apr 1 2009 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.18-9.2
- Add OSGi manifest for servlet-api.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-9.1
12 years, 12 months
[tomcat: 10/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
by Ivan Afonichev
commit e486acaad48c113ddb41f51a93ff652ec82dd9cc
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Mon Jul 27 06:05:36 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
tomcat6.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 3b5f1e7..61c8ca9 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 9.2%{?dist}
+Release: 10.2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -447,6 +447,9 @@ fi
%{appdir}/sample
%changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-10.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Apr 1 2009 akurtakov <akurtakov(a)dhcp-lab-180.englab.brq.redhat.com> 0:6.0.18-9.2
- Add OSGi manifest for servlet-api.
12 years, 12 months
[tomcat: 9/66] Add OSGi manifest for servlet-api.
by Ivan Afonichev
commit f999669ccb45265d815f783001864652e64fc652
Author: Alexander Kurtakov <akurtakov(a)fedoraproject.org>
Date: Wed Apr 1 20:29:13 2009 +0000
Add OSGi manifest for servlet-api.
servlet-api-OSGi-MANIFEST.MF | 10 ++++++++++
tomcat6.spec | 12 +++++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/servlet-api-OSGi-MANIFEST.MF b/servlet-api-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..957cb38
--- /dev/null
+++ b/servlet-api-OSGi-MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4
+Bundle-SymbolicName: javax.servlet
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Localization: plugin
+Bundle-Version: 2.5.0.v200806031605
+Bundle-Vendor: %bundleProvider
+Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
+ ="2.5",javax.servlet.resources;version="2.5"
diff --git a/tomcat6.spec b/tomcat6.spec
index c776460..3b5f1e7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 9.1%{?dist}
+Release: 9.2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -68,6 +68,7 @@ Source4: %{name}-%{major_version}.%{minor_version}.wrapper
Source5: %{name}-%{major_version}.%{minor_version}.logrotate
Source6: %{name}-%{major_version}.%{minor_version}-digest.script
Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
+Source8: servlet-api-OSGi-MANIFEST.MF
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -225,6 +226,12 @@ pushd ../web
popd
popd
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE8} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
+
%install
%{__rm} -rf $RPM_BUILD_ROOT
# build initial path structure
@@ -440,6 +447,9 @@ fi
%{appdir}/sample
%changelog
+* Wed Apr 1 2009 akurtakov <akurtakov(a)dhcp-lab-180.englab.brq.redhat.com> 0:6.0.18-9.2
+- Add OSGi manifest for servlet-api.
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-9.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
12 years, 12 months
[tomcat: 8/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
by Ivan Afonichev
commit 94f127f90a278f1a4259798118d6da79cabbea2a
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Feb 25 21:17:27 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
tomcat6.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 2a79b8e..c776460 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 8.1%{?dist}
+Release: 9.1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -440,6 +440,9 @@ fi
%{appdir}/sample
%changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:6.0.18-9.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Tue Dec 02 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-8.1
- build for Fedora
12 years, 12 months
[tomcat: 7/66] - build 0:6.0.18-8 for Fedora
by Ivan Afonichev
commit 75f506cc0116c081bb606b2a4f52bc926a048bc9
Author: dwalluck <dwalluck(a)fedoraproject.org>
Date: Tue Dec 2 16:26:49 2008 +0000
- build 0:6.0.18-8 for Fedora
tomcat6.spec | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index aaf38f7..2a79b8e 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -39,20 +39,22 @@
%define tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
-%define appdir %{_var}/lib/%{name}/webapps
+%define basedir %{_var}/lib/%{name}
+%define appdir %{basedir}/webapps
%define bindir %{_datadir}/%{name}/bin
%define confdir %{_sysconfdir}/%{name}
%define homedir %{_datadir}/%{name}
%define libdir %{_javadir}/%{name}
%define logdir %{_var}/log/%{name}
-%define tempdir %{_var}/cache/%{name}/temp
-%define workdir %{_var}/cache/%{name}/work
+%define cachedir %{_var}/cache/%{name}
+%define tempdir %{cachedir}/temp
+%define workdir %{cachedir}/work
%define _initrddir %{_sysconfdir}/init.d
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 6.2%{?dist}
+Release: 8.1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -131,6 +133,8 @@ Summary: Apache Tomcat JSP API implementation classes
Provides: jsp = %{jspspec}
Provides: jsp21
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
%description jsp-%{jspspec}-api
Apache Tomcat JSP API implementation classes.
@@ -156,6 +160,8 @@ Summary: Apache Tomcat Servlet API implementation classes
Provides: servlet = %{servletspec}
Provides: servlet6
Provides: servlet25
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
%description servlet-%{servletspec}-api
Apache Tomcat Servlet API implementation classes.
@@ -385,6 +391,7 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%dir %{basedir}
%attr(0775,root,tomcat) %dir %{appdir}
%dir %{confdir}
%dir %{confdir}/Catalina
@@ -396,6 +403,7 @@ fi
%config(noreplace) %{confdir}/server.xml
%attr(0660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/web.xml
+%attr(0775,root,tomcat) %dir %{cachedir}
%attr(0775,root,tomcat) %dir %{tempdir}
%attr(0775,root,tomcat) %dir %{workdir}
%{homedir}
@@ -432,10 +440,16 @@ fi
%{appdir}/sample
%changelog
-* Mon Oct 13 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-6.2
-- use Fedora-specific changes to force java 1.6.0
+* Tue Dec 02 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-8.1
+- build for Fedora
-* Tue Oct 07 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-6.1
+* Tue Dec 02 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-8
+- fix directory ownership
+
+* Thu Nov 13 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-7
+- add Requires for update-alternatives
+
+* Tue Oct 07 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-6
- use lsb_release instead of lsb-release to get the distributor
* Tue Oct 07 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-5
12 years, 12 months
[tomcat: 6/66] - use Fedora-specific changes to force java 1.6.0
by Ivan Afonichev
commit a2e53886a12ad7564c508764e0bbc7d691698bc9
Author: dwalluck <dwalluck(a)fedoraproject.org>
Date: Mon Oct 13 20:37:31 2008 +0000
- use Fedora-specific changes to force java 1.6.0
tomcat6-6.0.conf | 2 +-
tomcat6.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/tomcat6-6.0.conf b/tomcat6-6.0.conf
index dae17f6..668f81a 100644
--- a/tomcat6-6.0.conf
+++ b/tomcat6-6.0.conf
@@ -9,7 +9,7 @@
#
# Where your java installation lives
-#JAVA_HOME="/usr/lib/jvm/java"
+JAVA_HOME="/usr/lib/jvm/java-1.6.0"
# Where your tomcat installation lives
CATALINA_BASE="@@@TCHOME@@@"
diff --git a/tomcat6.spec b/tomcat6.spec
index 32564f4..aaf38f7 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -52,7 +52,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 6.1%{?dist}
+Release: 6.2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -77,14 +77,14 @@ BuildRequires: ecj
BuildRequires: findutils
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-daemon
-BuildRequires: java-devel
+BuildRequires: java-1.6.0-devel
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
Requires(pre): shadow-utils
Requires(pre): shadow-utils
Requires: jakarta-commons-daemon
Requires: jakarta-commons-logging
-Requires: java
+Requires: java-1.6.0
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -432,6 +432,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Oct 13 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-6.2
+- use Fedora-specific changes to force java 1.6.0
+
* Tue Oct 07 2008 David Walluck <dwalluck(a)redhat.com> 0:6.0.18-6.1
- use lsb_release instead of lsb-release to get the distributor
12 years, 12 months