packages: java-hamcrest11/hamcrest-nosrc.patch (NEW), java-hamcrest11/java-...
pawelz
pawelz at pld-linux.org
Tue Apr 20 17:14:37 CEST 2010
Author: pawelz Date: Tue Apr 20 15:14:37 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- hamcres-1.1 packaged as new spec, because it is not compatibile with
hamcrest-1.2. For example java-junit uses some API that does not exist in
1.2
---- Files affected:
packages/java-hamcrest11:
hamcrest-nosrc.patch (NONE -> 1.1) (NEW), java-hamcrest11.spec (NONE -> 1.1) (NEW), javadoc-build.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/java-hamcrest11/hamcrest-nosrc.patch
diff -u /dev/null packages/java-hamcrest11/hamcrest-nosrc.patch:1.1
--- /dev/null Tue Apr 20 17:14:37 2010
+++ packages/java-hamcrest11/hamcrest-nosrc.patch Tue Apr 20 17:14:31 2010
@@ -0,0 +1,15 @@
+--- build.xml~ 2008-11-16 00:15:07.000000000 +0100
++++ build.xml 2010-04-19 21:33:47.000000000 +0200
+@@ -236,10 +236,11 @@
+ </classpath>
+ </javac>
+ <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
+- <!-- Put Java source in Jars for user's convenience. -->
++ <!-- Put Java source in Jars for user's convenience.
+ <copy todir="build/temp/@{destjar}.contents">
+ <fileset dir="@{srcdir}"/>
+ </copy>
++ -->
+ <jar jarfile="@{destjar}">
+ <fileset dir="build/temp/@{destjar}.contents"/>
+ </jar>
================================================================
Index: packages/java-hamcrest11/java-hamcrest11.spec
diff -u /dev/null packages/java-hamcrest11/java-hamcrest11.spec:1.1
--- /dev/null Tue Apr 20 17:14:37 2010
+++ packages/java-hamcrest11/java-hamcrest11.spec Tue Apr 20 17:14:31 2010
@@ -0,0 +1,192 @@
+# $Revision$, $Date$
+# TODO:
+# - use more system packages? (jarjar, lib/integration/*)
+# - build javadoc (now it fails)
+# - does not build with gcj.
+#
+# Conditional build:
+%bcond_without javadoc # build javadoc
+%bcond_with tests # build and run tests (tests are broken)
+%bcond_with binary # do not compile .jars from source use bundled ones
+%bcond_with bootstrap # break BR loop (java-junit, java-qdox)
+
+%if %{with bootstrap}
+%define with_binary 1
+%undefine with_tests
+%undefine with_javadoc
+%endif
+
+%define rel 1
+%define srcname hamcrest
+%include /usr/lib/rpm/macros.java
+Summary: Hamcrest - a library of matchers
+Summary(pl.UTF-8): Hamcrest - biblioteka klas dopasowujących
+Name: java-hamcrest
+Version: 1.1
+Release: %{bootstrap_release %rel}
+License: BSD
+Group: Libraries/Java
+Source0: http://hamcrest.googlecode.com/files/%{srcname}-%{version}.tgz
+# Source0-md5: 1bd4fd301c1a0dc748082378a59cb281
+Patch0: %{srcname}-nosrc.patch
+Patch1: javadoc-build.patch
+URL: http://code.google.com/p/hamcrest/
+%if %{without binary}
+BuildRequires: ant >= 1.6
+%{?with_tests:BuildRequires: ant-junit >= 1.6}
+%{?with_tests:BuildRequires: java-junit}
+BuildRequires: java-qdox
+BuildRequires: jdk
+%endif
+BuildRequires: jpackage-utils
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.557
+Requires: java-qdox
+Requires: jpackage-utils
+Obsoletes: hamcrest
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Hamcrest is a library of matchers, which can be combined in to create
+flexible expressions of intent in tests.
+
+%description -l pl.UTF-8
+Hamcrest to biblioteka klas dopasowujących, które można łączyć w celu
+utworzenia elastycznych wyrażeń do wykorzystania w testach.
+
+%package javadoc
+Summary: Javadoc manual for hamcrest
+Summary(pl.UTF-8): Dokumentacja javadoc do hamcresta
+Group: Documentation
+Requires: jpackage-utils
+Obsoletes: hamcrest-javadoc
+
+%description javadoc
+Javadoc manual for hamcrest.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja javadoc do hamcresta.
+
+%package source
+Summary: Source code of %{srcname}
+Summary(pl.UTF-8): Kod źródłowy %{srcname}
+Group: Documentation
+Requires: jpackage-utils >= 1.7.5-2
+
+%description source
+Source code of %{srcname}.
+
+%description source -l pl.UTF-8
+Kod źródłowy %{srcname}.
+
+%prep
+%setup -q -n %{srcname}-%{version}
+
+%undos build.xml
+
+%patch0 -p0
+%patch1 -p0
+
+rm -vf lib/integration/junit-*.jar
+rm -vf lib/generator/qdox-*.jar
+
+%if %{without binary}
+rm -vf *.jar
+%endif
+
+# TODO: add new property (with this default value) do be override with -D
+# TODO: add build.properties support to build.xml
+%{__sed} -i -e 's,lib/generator/qdox-1.6.1.jar,${qdox.jar},g' build.xml
+
+%build
+export JAVA_HOME="%{java_home}"
+
+%if %{with binary}
+install -d build
+cp -af *.jar build
+%else
+qdox_jar=$(find-jar qdox)
+CLASSPATH=$qdox_jar
+cat <<EOF > build.properties
+qdox.jar=$qdox_jar
+EOF
+
+%ant core generator library integration \
+ -Dqdox.jar=$qdox_jar \
+ -Dversion=%{version}
+%endif
+
+%if %{with javadoc}
+# doesn't build
+%ant javadoc \
+ -Dqdox.jar=$qdox_jar \
+ -Dversion=%{version}
+%endif
+
+%if %{with tests}
+%ant unit-test \
+ -Dqdox.jar=$qdox_jar \
+ -Dversion=%{version}
+%endif
+
+# source
+%jar cf %{srcname}.src.jar -C build/temp/hamcrest-library/generated-code .
+%jar uf %{srcname}.src.jar -C build/temp/hamcrest-core/generated-code .
+for I in examples integration library generator core; do
+ %jar uf %{srcname}.src.jar -C hamcrest-$I/src/main/java .
+done
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_javadir}
+
+for f in core generator integration library; do
+ cp -a build/hamcrest-$f-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ ln -sf hamcrest-$f-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/hamcrest-$f.jar
+done
+
+%if %{with javadoc}
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
+
+#source
+install -d $RPM_BUILD_ROOT%{_javasrcdir}
+cp -a %{srcname}.src.jar $RPM_BUILD_ROOT%{_javasrcdir}/%{srcname}.src.jar
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post javadoc
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+
+%files
+%defattr(644,root,root,755)
+%doc CHANGES.txt LICENSE.txt README.txt
+%{_javadir}/*.jar
+
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif
+
+%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.1 2010/04/20 15:14:31 pawelz
+- hamcres-1.1 packaged as new spec, because it is not compatibile with
+ hamcrest-1.2. For example java-junit uses some API that does not exist in
+ 1.2
+
================================================================
Index: packages/java-hamcrest11/javadoc-build.patch
diff -u /dev/null packages/java-hamcrest11/javadoc-build.patch:1.1
--- /dev/null Tue Apr 20 17:14:37 2010
+++ packages/java-hamcrest11/javadoc-build.patch Tue Apr 20 17:14:31 2010
@@ -0,0 +1,22 @@
+--- build.xml.orig 2010-04-20 11:10:14.000000000 +0200
++++ build.xml 2010-04-20 11:15:13.000000000 +0200
+@@ -196,8 +196,7 @@
+
+ <target name="javadoc" depends="library">
+ <mkdir dir="build/javadoc"/>
+- <javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+- overview="overview.html">
++ <javadoc destdir="build/javadoc" source="1.5" failonerror="yes">
+
+ <classpath>
+ <fileset dir="lib/integration">
+@@ -208,7 +207,8 @@
+ <packageset dir="hamcrest-core/src/main/java"/>
+ <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
+ <packageset dir="hamcrest-integration/src/main/java"/>
+- <packageset dir="build/generated-code"/>
++ <packageset dir="build/temp/hamcrest-library/generated-code"/>
++ <packageset dir="build/temp/hamcrest-core/generated-code"/>
+
+ <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
+ <group title="Matcher Library" packages="org.hamcrest.*"/>
================================================================
More information about the pld-cvs-commit
mailing list