packages: java-struts-legacy/java-struts-legacy.spec - renamed from jakarta...

[pawelz]

Author: pawelz                       Date: Tue May 19 06:30:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- renamed from jakarta-struts-legacy
- unified java spec
- does not build.

---- Files affected:
packages/java-struts-legacy:
   java-struts-legacy.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/java-struts-legacy/java-struts-legacy.spec
diff -u packages/java-struts-legacy/java-struts-legacy.spec:1.10 packages/java-struts-legacy/java-struts-legacy.spec:1.11
--- packages/java-struts-legacy/java-struts-legacy.spec:1.10	Mon Apr 16 18:01:18 2007
+++ packages/java-struts-legacy/java-struts-legacy.spec	Tue May 19 08:30:47 2009
@@ -1,23 +1,37 @@
 # $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
+
+%define         srcname         struts-legacy
+
 Summary:	struts-legacy - classes removed from the core Struts distribution
 Summary(pl.UTF-8):	struts-legacy - klasy usunięte z głównej dystrybucji Struts
-Name:		jakarta-struts-legacy
+Name:		java-struts-legacy
 Version:	1.0
 Release:	0.1
 License:	Apache v1.1
-Source0:	http://www.apache.org/dist/jakarta/struts/struts-legacy/struts-legacy-%{version}-src.tar.gz
+Source0:	http://archive.apache.org/dist/jakarta/struts/struts-legacy/struts-legacy-%{version}-src.tar.gz
 # Source0-md5:	805b7f3e787c1469f57fed9f5eebc3a1
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 URL:		http://struts.apache.org/
 BuildRequires:	ant >= 1.6
-BuildRequires:	jakarta-commons-beanutils
-BuildRequires:	jakarta-commons-collections
+BuildRequires:	java-commons-beanutils
+BuildRequires:	java-commons-collections
+%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
 BuildRequires:	jdbc-stdext >= 2.0-2
 BuildRequires:	jpackage-utils
+BuildRequires:  rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
-Requires:	jakarta-commons-beanutils
-Requires:	jakarta-commons-collections
+Requires:	java-commons-beanutils
+Requires:	java-commons-collections
 Requires:	jdbc-stdext >= 2.0
 Requires:	servlet
 BuildArch:	noarch
@@ -36,23 +50,24 @@
 "legacy").
 
 %package javadoc
-Summary:	Online manual for %{name}
-Summary(pl.UTF-8):	Dokumentacja online do %{name}
+Summary:	Online manual for %{srcname}
+Summary(pl.UTF-8):	Dokumentacja online do %{srcname}
 Group:		Documentation
 Requires:	jpackage-utils
 
 %description javadoc
-Documentation for %{name}.
+Documentation for %{srcname}.
 
 %description javadoc -l pl.UTF-8
-Dokumentacja do %{name}.
+Dokumentacja do %{srcname}.
 
 %prep
 %setup -q -n struts-legacy-%{version}-src
 
 %build
 required_jars="commons-logging"
-export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 %ant dist \
 	-Djdk.version=1.4 \
 
@@ -66,29 +81,30 @@
 done
 
 # javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
+symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
 %doc dist/LICENSE.txt
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +112,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/05/19 06:30:47  pawelz
+- renamed from jakarta-struts-legacy
+- unified java spec
+- does not build.
+
 Revision 1.10  2007/04/16 16:01:18  qboosh
 - pl fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-struts-legacy/java-struts-legacy.spec?r1=1.10&r2=1.11&f=u