packages: java-qdox/java-qdox.spec - up to 1.11 - allow any jdk except java...

[pawelz]

Author: pawelz                       Date: Mon Apr 19 19:14:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.11
- allow any jdk except java-gcj-compat-devel
- -source subpackage
- declare javadoc bcond (it was used but not declared)

---- Files affected:
packages/java-qdox:
   java-qdox.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/java-qdox/java-qdox.spec
diff -u packages/java-qdox/java-qdox.spec:1.22 packages/java-qdox/java-qdox.spec:1.23
--- packages/java-qdox/java-qdox.spec:1.22	Wed Aug 19 16:04:40 2009
+++ packages/java-qdox/java-qdox.spec	Mon Apr 19 21:14:19 2010
@@ -2,12 +2,7 @@
 # TODO:
 # - tests
 
-%bcond_without	javadoc		# build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun		# build with gcj
-%else
-%bcond_with	java_sun		# build with java-sun
-%endif
+%bcond_without	javadoc	# don't build apidocs
 
 %include	/usr/lib/rpm/macros.java
 
@@ -15,20 +10,20 @@
 Summary:	Extract class/interface/method definitions from sources
 Summary(pl.UTF-8):	Wyciąganie definicji klas/interfejsów/metod ze źródeł
 Name:		java-qdox
-Version:	1.8
-Release:	3
+Version:	1.11
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
 Source0:	http://repository.codehaus.org/com/thoughtworks/qdox/qdox/%{version}/%{srcname}-%{version}-sources.jar
-# Source0-md5:	9cbc745194a39ec27f54bbe16c2342cc
+# Source0-md5:	acb16e9037242322155631a32dba8661
 URL:		http://qdox.codehaus.org/
+# It don't use ant as build system, but it links with ant
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.555
+BuildConflicts:	java-gcj-compat-devel
 Obsoletes:	qdox
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,6 +53,17 @@
 %description javadoc -l pl.UTF-8
 Dokumentacja javadoc dla pakietu %{srcname}.
 
+%package source
+Summary:	Source code of %{srcname}
+Summary(pl.UTF-8):	Kod źródłowy %{srcname}
+Group:		Documentation
+
+%description source
+Source code %{srcname}.
+
+%description source -l pl.UTF-8
+Kod źródłowy %{srcname}.
+
 %prep
 %setup -qc
 
@@ -68,7 +74,7 @@
 install -d build
 
 %javac \
-	-classpath $CLASSPATH \
+	-classpath "$CLASSPATH" \
 	-source 1.4 \
 	-target 1.4 \
 	-d build \
@@ -76,7 +82,6 @@
 
 %if %{with javadoc}
 %javadoc -d apidocs \
-	%{?with_java_sun:com.thoughtworks.qdox} \
 	$(find -name '*.java' | grep -v ^com/thoughtworks/qdox/junit)
 %endif
 
@@ -97,6 +102,10 @@
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
+# source
+install -d $RPM_BUILD_ROOT%{_javasrcdir}
+install %{SOURCE0} $RPM_BUILD_ROOT%{_javasrcdir}/%{srcname}.src.jar
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,12 +121,22 @@
 %{_javadocdir}/%{srcname}-%{version}
 %ghost %{_javadocdir}/%{srcname}
 
+%files source
+%defattr(644,root,root,755)
+%{_javasrcdir}/%{srcname}.src.jar
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/04/19 19:14:19  pawelz
+- up to 1.11
+- allow any jdk except java-gcj-compat-devel
+- -source subpackage
+- declare javadoc bcond (it was used but not declared)
+
 Revision 1.22  2009/08/19 14:04:40  pawelz
 - we don't execute tests (see TODO), so don't compile them and don't BR junit
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-qdox/java-qdox.spec?r1=1.22&r2=1.23&f=u