rpms/tomcat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Provided local paths for libs

Browse Source 
- Fixed dependencies
- Fixed update temp/work cleanup
This commit is contained in:
Ivan Afonichev 2011-05-05 01:42:20 +04:00
parent 468fdbab7f
commit 31d304e3da
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tomcat.spec
View File

@ -53,7 +53,7 @@
Name: tomcat Name: tomcat
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 3%{?dist} Release: 4%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons Group: System Environment/Daemons
@ -88,6 +88,8 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j BuildRequires: log4j
BuildRequires: geronimo-jaxrpc
BuildRequires: wsdl4j
Requires: apache-commons-daemon Requires: apache-commons-daemon
Requires: apache-commons-logging Requires: apache-commons-logging
Requires: apache-commons-collections Requires: apache-commons-collections
@ -97,7 +99,6 @@ Requires: java >= 1:1.6.0
Requires: procps Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release}
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(pre): shadow-utils
Requires(post): chkconfig Requires(post): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig
Requires(post): redhat-lsb Requires(post): redhat-lsb
@ -216,6 +217,8 @@ export OPT_JAR_LIST="xalan-j2-serializer"
# tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar
# so just create a dummy file for later removal # so just create a dummy file for later removal
touch HACK touch HACK
%{__mkdir_p} HACKDIR
touch HACKDIR/build.xml
# who needs a build.properties file anyway # who needs a build.properties file anyway
%{ant} -Dbase.path="." \ %{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \ -Dbuild.compiler="modern" \
@ -224,20 +227,21 @@ export OPT_JAR_LIST="xalan-j2-serializer"
-Dcommons-daemon.native.src.tgz="HACK" \ -Dcommons-daemon.native.src.tgz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \ -Djasper-jdt.jar="$(build-classpath ecj)" \
-Djdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \
-Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \
-Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.tar.gz="HACK" \
-Dversion="%{version}" \ -Dtomcat-native.dll.win32="HACK" \
-Dversion.build="%{micro_version}" -Dtomcat-native.dll.x64="HACK" \
# javadoc generation -Dtomcat-native.dll.i64="HACK" \
%{ant} -Dbase.path="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \
-Dbuild.compiler="modern" \ -Dnsis.exe="HACK" \
-Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
-Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
-Dcommons-daemon.native.src.tgz="HACK" \ -Dcommons-pool.home="HACKDIR" \
-Djasper-jdt.jar="$(build-classpath ecj)" \ -Dcommons-dbcp.home="HACKDIR" \
-Djdt.jar="$(build-classpath ecj)" \ -Dno.build.dbcp=true \
-Dversion="%{version}" \ -Dversion="%{version}" \
-Dversion.build="%{micro_version}" \ -Dversion.build="%{micro_version}" \
dist-prepare dist-source javadoc deploy dist-prepare dist-source javadoc
# remove some jars that we'll replace with symlinks later # remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \ %{__rm} output/build/bin/commons-daemon.jar \
@ -431,7 +435,7 @@ done
%preun %preun
# clean tempdir and workdir on removal or upgrade # clean tempdir and workdir on removal or upgrade
%{__rm} -rf %{workdir} %{tempdir} %{__rm} -rf %{workdir}/* %{tempdir}/*
if [ "$1" = "0" ]; then if [ "$1" = "0" ]; then
%{_initrddir}/%{name} stop >/dev/null 2>&1 %{_initrddir}/%{name} stop >/dev/null 2>&1
/sbin/chkconfig --del %{name} /sbin/chkconfig --del %{name}
@ -551,13 +555,17 @@ fi
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Mon May 5 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.12-4
- Provided local paths for libs
- Fixed dependencies
- Fixed update temp/work cleanup
* Mon May 2 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.12-3 * Mon May 2 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.12-3
- Fixed package groups - Fixed package groups
- Fixed some permissions - Fixed some permissions
- Fixed some links - Fixed some links
- Removed old tomcat6 crap - Removed old tomcat6 crap
%changelog
* Thu Apr 28 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.12-2 * Thu Apr 28 2011 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.12-2
- Package now named just tomcat instead of tomcat7 - Package now named just tomcat instead of tomcat7
- Removed Provides: %{name}-log4j - Removed Provides: %{name}-log4j