Author: pawelz Date: Wed May 20 11:21:31 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- webapps G: Networking/Daemons/Java/Servlets
- better path for webapps
- JDK bconds
- include rpm macros
- rel 1.1 (it needs some cleanup before sending to builders)
---- Files affected:
packages/java-struts:
java-struts.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: packages/java-struts/java-struts.spec
diff -u packages/java-struts/java-struts.spec:1.26
packages/java-struts/java-struts.spec:1.27
--- packages/java-struts/java-struts.spec:1.26 Mon Feb 2 13:28:36 2009
+++ packages/java-struts/java-struts.spec Wed May 20 13:21:26 2009
@@ -1,9 +1,18 @@
# $Revision$, $Date$
+%bcond_without javadoc # don't build javadoc
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+
+%include /usr/lib/rpm/macros.java
+
Summary: Web application framework
Summary(pl.UTF-8): Szkielet dla aplikacji WWW
Name: java-struts
Version: 1.3.10
-Release: 1
+Release: 1.1
License: Apache v2.0
Group: Libraries/Java
Source0:
http://www.apache.org/dist/struts/source/struts-%{version}-src.zip
@@ -43,7 +52,7 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define tomcatappsdir %{_libdir}/tomcat/webapps
+%define tomcatappsdir %{_datadir}/%{name}/webapps
%define webapps blank cookbook el-example examples
faces-example1 faces-example2 mailreader scripting-mailreader
%description
@@ -99,9 +108,9 @@
%package webapps
Summary: Sample Struts webapps for tomcat
Summary(pl.UTF-8): Przykładowe aplikacje Struts dla tomcata
-Group: Development/Languages/Java
+Group: Networking/Daemons/Java/Servlets
Requires: %{name} = %{version}-%{release}
-Requires: apache-tomcat
+Requires: tomcat
Obsoletes: jakarta-struts-webapps
%description webapps
@@ -270,6 +279,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2009/05/20 11:21:26 pawelz
+- webapps G: Networking/Daemons/Java/Servlets
+- better path for webapps
+- JDK bconds
+- include rpm macros
+- rel 1.1 (it needs some cleanup before sending to builders)
+
Revision 1.26 2009/02/02 12:28:36 glen
- Libraries/Java group
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-struts/java-struts.spec?r1=1.26&r2=1.27&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
