[hamcrest] Updated to latest upstream version
Tomas Radej
tradej at fedoraproject.org
Fri Apr 5 14:26:37 UTC 2013
commit 5275b44dee5715c179b8df5a49b9a07601872733
Author: Tomas Radej <tradej at redhat.com>
Date: Thu Mar 21 15:19:43 2013 +0100
Updated to latest upstream version
.gitignore | 13 +++
hamcrest-1.1-build.patch | 42 ---------
hamcrest-1.1-no-integration.patch | 41 ---------
hamcrest-1.1-no-jarjar.patch | 26 ------
hamcrest-1.3-build.patch | 30 +++++++
hamcrest-1.3-javadoc.patch | 17 ++++
hamcrest-1.3-no-integration.patch | 33 +++++++
hamcrest-1.3-no-jarjar.patch | 23 +++++
hamcrest-all-1.1.pom | 12 ---
hamcrest-core-1.1.pom | 12 ---
hamcrest-core-MANIFEST.MF | 12 ---
hamcrest-generator-1.1.pom | 20 -----
hamcrest-generator-MANIFEST.MF | 18 ----
hamcrest-integration-1.1.pom | 20 -----
hamcrest-integration-MANIFEST.MF | 14 ---
hamcrest-library-1.1.pom | 20 -----
hamcrest-library-MANIFEST.MF | 15 ---
hamcrest-parent-1.1.pom | 170 -------------------------------------
hamcrest-text-1.1.pom | 20 -----
hamcrest-text-MANIFEST.MF | 14 ---
hamcrest.spec | 59 ++++++++-----
sources | 14 +++-
22 files changed, 164 insertions(+), 481 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ae6c1a..880b6d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,14 @@
hamcrest-1.1.tgz
+/hamcrest-all-1.3.pom
+/hamcrest-core-1.3.pom
+/hamcrest-generator-1.3.pom
+/hamcrest-integration-1.3.pom
+/hamcrest-library-1.3.pom
+/hamcrest-parent-1.3.pom
+/hamcrest-text-1.3.pom
+/hamcrest-core-MANIFEST.MF
+/hamcrest-generator-MANIFEST.MF
+/hamcrest-integration-MANIFEST.MF
+/hamcrest-library-MANIFEST.MF
+/hamcrest-text-MANIFEST.MF
+/hamcrest-1.3.tgz
diff --git a/hamcrest-1.3-build.patch b/hamcrest-1.3-build.patch
new file mode 100644
index 0000000..d3af809
--- /dev/null
+++ b/hamcrest-1.3-build.patch
@@ -0,0 +1,30 @@
+diff --git a/build.xml b/build.xml
+index 1cfd4fb..54d43fe 100644
+--- a/build.xml
++++ b/build.xml
+@@ -14,13 +14,13 @@
+ <target name="generator" description="Build code generator tool">
+ <java-to-jar srcdir="hamcrest-generator/src/main/java"
+ modulename="hamcrest-generator-nodeps"
+- classpath="lib/generator/qdox-1.12.jar"/>
++ classpath="lib/generator/qdox.jar"/>
+
+ <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
++ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
+ <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+ <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
+- <zipfileset src="lib/generator/qdox-1.12.jar"/>
++ <zipfileset src="lib/generator/qdox.jar"/>
+ <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox. at 1"/>
+ </jarjar>
+ <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
+@@ -152,7 +152,7 @@
+
+ <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
+ destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
+- windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
++ windowtitle="Hamcrest" source="1.6" failonerror="yes">
+ <classpath>
+ <fileset dir="lib/integration">
+ <include name="*.jar"/>
diff --git a/hamcrest-1.3-javadoc.patch b/hamcrest-1.3-javadoc.patch
new file mode 100644
index 0000000..6c21e7d
--- /dev/null
+++ b/hamcrest-1.3-javadoc.patch
@@ -0,0 +1,17 @@
+diff --git a/build.xml b/build.xml
+index ed57763..a4550cb 100644
+--- a/build.xml
++++ b/build.xml
+@@ -135,11 +135,10 @@
+ </target>
+
+ <target name="javadoc" description="build javadoc jars">
+- <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
++ <java-to-javadoc-jar modulename="hamcrest-generator"/>
+ <java-to-javadoc-jar modulename="hamcrest-core"/>
+ <java-to-javadoc-jar modulename="hamcrest-library"/>
+ <java-to-javadoc-jar modulename="hamcrest-integration"/>
+- <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
+
+ <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
+ destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
diff --git a/hamcrest-1.3-no-integration.patch b/hamcrest-1.3-no-integration.patch
new file mode 100644
index 0000000..886083d
--- /dev/null
+++ b/hamcrest-1.3-no-integration.patch
@@ -0,0 +1,33 @@
+diff --git a/build.xml b/build.xml
+index c59c9fa..e5eaa56 100644
+--- a/build.xml
++++ b/build.xml
+@@ -112,7 +112,7 @@
+ build/hamcrest-integration-${version}.jar"/>
+ </target>
+
+- <target name="bigjar" depends="core, library, integration, generator"
++ <target name="bigjar" depends="core, library, generator"
+ description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration.">
+ <mkdir dir="build/temp/hamcrest-all-${version}.jar.manifest"/>
+ <manifest file="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF">
+@@ -132,7 +132,6 @@
+ <zipfileset src="build/hamcrest-core-${version}-sources.jar"/>
+ <zipfileset src="build/hamcrest-library-${version}-sources.jar"/>
+ <zipfileset src="build/hamcrest-generator-${version}-sources.jar"/>
+- <zipfileset src="build/hamcrest-integration-${version}-sources.jar"/>
+ </jar>
+ </target>
+
+@@ -146,11 +145,6 @@
+ <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
+ destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
+ windowtitle="Hamcrest" source="1.6" failonerror="yes">
+- <classpath>
+- <fileset dir="lib/integration">
+- <include name="*.jar"/>
+- </fileset>
+- </classpath>
+ <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>
+ <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>
+ <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>
diff --git a/hamcrest-1.3-no-jarjar.patch b/hamcrest-1.3-no-jarjar.patch
new file mode 100644
index 0000000..caf5767
--- /dev/null
+++ b/hamcrest-1.3-no-jarjar.patch
@@ -0,0 +1,23 @@
+diff --git a/build.xml b/build.xml
+index 54d43fe..ed57763 100644
+--- a/build.xml
++++ b/build.xml
+@@ -13,17 +13,8 @@
+
+ <target name="generator" description="Build code generator tool">
+ <java-to-jar srcdir="hamcrest-generator/src/main/java"
+- modulename="hamcrest-generator-nodeps"
++ modulename="hamcrest-generator"
+ classpath="lib/generator/qdox.jar"/>
+-
+- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
+- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
+- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
+- <zipfileset src="lib/generator/qdox.jar"/>
+- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox. at 1"/>
+- </jarjar>
+- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
+ </target>
+
+ <target name="core" depends="generator" description="Build core Hamcrest library">
diff --git a/hamcrest.spec b/hamcrest.spec
index 0dee72c..02f6c50 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -49,35 +49,42 @@
%endif
Name: hamcrest
-Version: 1.1
-Release: 22%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
URL: http://code.google.com/p/hamcrest/
Group: Development/Tools
-Source0: http://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-Source1: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom
-Source2: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.pom
-Source3: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-integration/1.1/hamcrest-integration-1.1.pom
-Source4: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-generator/1.1/hamcrest-generator-1.1.pom
-Source5: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom
-Source6: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.pom
-Source7: hamcrest-text-1.1.pom
+Source0: http://%{name}.googlecode.com/files/%{name}-1.3.tgz
+Source1: http://repo1.maven.org/maven2/org/%{name}/%{name}-parent/%{version}/%{name}-parent-%{version}.pom
+Source2: http://repo1.maven.org/maven2/org/%{name}/%{name}-library/%{version}/%{name}-library-%{version}.pom
+Source3: http://repo1.maven.org/maven2/org/%{name}/%{name}-integration/%{version}/%{name}-integration-%{version}.pom
+Source4: http://repo1.maven.org/maven2/org/%{name}/%{name}-generator/%{version}/%{name}-generator-%{version}.pom
+Source5: http://repo1.maven.org/maven2/org/%{name}/%{name}-core/%{version}/%{name}-core-%{version}.pom
+Source6: http://repo1.maven.org/maven2/org/%{name}/%{name}-all/%{version}/%{name}-all-%{version}.pom
+# This file was added by the maintainer for compatibility with maven dep
+# solving system
+Source7: %{name}-text-%{version}.pom
+
Source8: hamcrest-core-MANIFEST.MF
Source9: hamcrest-library-MANIFEST.MF
Source10: hamcrest-text-MANIFEST.MF
Source11: hamcrest-integration-MANIFEST.MF
Source12: hamcrest-generator-MANIFEST.MF
-Patch0: hamcrest-1.1-build.patch
-Patch1: hamcrest-1.1-no-jarjar.patch
-Patch2: hamcrest-1.1-no-integration.patch
+
+Patch0: %{name}-%{version}-build.patch
+Patch1: %{name}-%{version}-no-jarjar.patch
+Patch2: %{name}-%{version}-no-integration.patch
+Patch3: %{name}-%{version}-javadoc.patch
+
Requires: java >= 1:1.6.0
+Requires: qdox
%if %with integration
Requires: easymock2
#Requires: jmock
%endif
-Requires: qdox
+
BuildRequires: jpackage-utils >= 0:1.7.4
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5
@@ -141,26 +148,27 @@ ln -sf $(build-classpath easymock2) lib/integration/
%if %with integration
ln -sf $(build-classpath jmock) lib/integration/
%endif
-# BUILD/hamcrest-1.1/lib/integration/junit-3.8.1.jar.no
-ln -sf $(build-classpath junit) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
ln -sf $(build-classpath testng-jdk15) lib/integration/
%endif
-%patch0 -p0
+%patch0 -p1
%if %without jarjar
%patch1 -p1
%endif
%if %without integration
-#%patch2 -p1
+%patch2 -p1
%endif
+%patch3 -p1
perl -pi -e 's/\r$//g' LICENSE.txt
%build
export CLASSPATH=$(build-classpath qdox)
export OPT_JAR_LIST="junit ant/ant-junit"
-ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=first clean core generator library text bigjar javadoc
+# The unit-test goal is switched off as some tests fail with JDK 7
+# see https://github.com/hamcrest/JavaHamcrest/issues/30
+ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
# inject OSGi manifests
mkdir -p META-INF
@@ -231,7 +239,7 @@ install -m 644 build/%{name}-unit-test-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/temp/hamcrest-all-1.3-javadoc.jar.contents/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# demo
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -261,6 +269,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Thu Mar 21 2013 Tomas Radej <tradej at redhat.com> - 0:1.3-1
+- Updated to latest upstream version
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -389,18 +400,18 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
* Thu Aug 10 2006 Karsten Hopp <karsten at redhat.de> 0:3.8.2-2jpp_3fc
- Require(post/postun): coreutils
-* Sun Jun 23 2006 Deepak Bhole <dbhole at redhat.com> - 0:3.8.2-2jpp_2fc
+* Fri Jun 23 2006 Deepak Bhole <dbhole at redhat.com> - 0:3.8.2-2jpp_2fc
- Rebuilt.
-* Sat Jun 22 2006 Deepak Bhole <dbhole at redhat.com> - 0:3.8.2-2jpp_1fc
+* Thu Jun 22 2006 Deepak Bhole <dbhole at redhat.com> - 0:3.8.2-2jpp_1fc
- Upgrade to 3.8.2
- Added conditional native compilation.
- Fix path where demo is located.
-* Mon Mar 03 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.8.2-1jpp
+* Fri Mar 03 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.8.2-1jpp
- First JPP-1.7 release
-* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
+* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
- Rebuild with ant-1.6.2
* Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:3.8.1-3jpp
- update for JPackage 1.5
diff --git a/sources b/sources
index bc59c42..9f6ba52 100644
--- a/sources
+++ b/sources
@@ -1 +1,13 @@
-1bd4fd301c1a0dc748082378a59cb281 hamcrest-1.1.tgz
+29b18baac02244a9b7568d5bd5bb1c42 hamcrest-all-1.3.pom
+7cd680c223f3807e1ef353466b9a4b25 hamcrest-core-1.3.pom
+ba3c980bbf7d7b91d63d99da503aa3f4 hamcrest-generator-1.3.pom
+442fa9ad7a4dfbd6a2ab5fca6e9b36c1 hamcrest-integration-1.3.pom
+f09e58cd2a1ea76816c17141db41b2e1 hamcrest-library-1.3.pom
+7591ddb3581de8684c17e51741a7461d hamcrest-parent-1.3.pom
+de8c4213de11a0c2f83821bb700ac5eb hamcrest-text-1.3.pom
+936fbdde78bd9896985405ce7e9fedb0 hamcrest-core-MANIFEST.MF
+53744b9395f762bfbcdb9a6dcef84fc6 hamcrest-generator-MANIFEST.MF
+9dd6758de43d07f08bbd3e242b9c01ee hamcrest-integration-MANIFEST.MF
+b6d199eaa9b403df16a31e285d6d0cdc hamcrest-library-MANIFEST.MF
+e11cedd6f8f6be75c373b9519475abb3 hamcrest-text-MANIFEST.MF
+92e91c2754d44e49b72d70c10a04cb08 hamcrest-1.3.tgz
More information about the scm-commits
mailing list