Author: pawelz Date: Wed Sep 2 10:04:42 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fixes for tomcat 6 (version for tomcat-5.5 saved on TOMCAT-5_5 branch)
- do not install anything into tomcat lib directory. Use jira/WEB-INF/lib
- R tomcat >= 0:6.0.20-2
- rel 2
---- Files affected:
packages/jira-enterprise:
jira-enterprise.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: packages/jira-enterprise/jira-enterprise.spec
diff -u packages/jira-enterprise/jira-enterprise.spec:1.15
packages/jira-enterprise/jira-enterprise.spec:1.16
--- packages/jira-enterprise/jira-enterprise.spec:1.15 Thu Jun 25 15:08:31 2009
+++ packages/jira-enterprise/jira-enterprise.spec Wed Sep 2 12:04:37 2009
@@ -6,7 +6,7 @@
Summary: JIRA bug and issue tracker
Name: jira-enterprise
Version: 3.13.4
-Release: 1
+Release: 2
License: Proprietary, not distributable
Group: Networking/Daemons/Java/Servlets
# Sources:
@@ -27,7 +27,7 @@
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: jpackage-utils
-Requires: tomcat
+Requires: tomcat >= 0:6.0.20-2
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,8 +67,7 @@
ln -s %{_sysconfdir}/jira/osuser.xml
$RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/classes/osuser.xml
# libraries missing in tomcat 5.5
-install -d $RPM_BUILD_ROOT%{_datadir}/tomcat/common/lib
-cp -a jira-jars-tomcat5/* $RPM_BUILD_ROOT%{_datadir}/tomcat/common/lib
+cp -a jira-jars-tomcat5/* $RPM_BUILD_ROOT%{_datadir}/jira/WEB-INF/lib
%clean
rm -rf $RPM_BUILD_ROOT
@@ -90,7 +89,6 @@
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira/attachments
%attr(2775,root,servlet) %dir %{_sharedstatedir}/jira/backups
%attr(2775,root,servlet) %dir /var/log/jira
-%{_datadir}/tomcat/common/lib/*.jar
%doc licenses/csv.license README.PLD
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -99,6 +97,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.16 2009/09/02 10:04:37 pawelz
+- fixes for tomcat 6 (version for tomcat-5.5 saved on TOMCAT-5_5 branch)
+- do not install anything into tomcat lib directory. Use jira/WEB-INF/lib
+- R tomcat >= 0:6.0.20-2
+- rel 2
+
Revision 1.15 2009/06/25 13:08:31 pawelz
- up to 3.13.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jira-enterprise/jira-enterprise.spec?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
