diff --git a/hamcrest-all-1.1.pom b/hamcrest-all-1.1.pom deleted file mode 100644 index 7dc4cf6..0000000 --- a/hamcrest-all-1.1.pom +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.hamcrest - hamcrest-parent - 1.1 - - hamcrest-all - jar - Hamcrest All - - diff --git a/hamcrest-core-1.1-MANIFEST.MF b/hamcrest-core-1.1-MANIFEST.MF deleted file mode 100644 index cd49797..0000000 --- a/hamcrest-core-1.1-MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.hamcrest.core -Export-Package: org.hamcrest;version="1.1.0";core=split;mandatory:=cor - e,org.hamcrest.core;version="1.1.0",org.hamcrest.internal;version="1. - 1.0";x-internal:=true -Bundle-Version: 1.1.0.v20090501071000 -Bundle-ManifestVersion: 2 diff --git a/hamcrest-core-1.1.pom b/hamcrest-core-1.1.pom deleted file mode 100644 index 0911717..0000000 --- a/hamcrest-core-1.1.pom +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.hamcrest - hamcrest-parent - 1.1 - - hamcrest-core - jar - Hamcrest Core - - diff --git a/hamcrest-generator-1.1.pom b/hamcrest-generator-1.1.pom deleted file mode 100644 index 8da1d8a..0000000 --- a/hamcrest-generator-1.1.pom +++ /dev/null @@ -1,20 +0,0 @@ - - 4.0.0 - - org.hamcrest - hamcrest-parent - 1.1 - - hamcrest-generator - jar - Hamcrest Generator - - - - ${pom.groupId} - hamcrest-core - ${pom.version} - - - - diff --git a/hamcrest-integration-1.1.pom b/hamcrest-integration-1.1.pom deleted file mode 100644 index 912f062..0000000 --- a/hamcrest-integration-1.1.pom +++ /dev/null @@ -1,20 +0,0 @@ - - 4.0.0 - - org.hamcrest - hamcrest-parent - 1.1 - - hamcrest-integration - jar - Hamcrest Integration - - - - ${pom.groupId} - hamcrest-core - ${pom.version} - - - - diff --git a/hamcrest-library-1.1.pom b/hamcrest-library-1.1.pom deleted file mode 100644 index cdef1cb..0000000 --- a/hamcrest-library-1.1.pom +++ /dev/null @@ -1,20 +0,0 @@ - - 4.0.0 - - org.hamcrest - hamcrest-parent - 1.1 - - hamcrest-library - jar - Hamcrest Library - - - - ${pom.groupId} - hamcrest-core - ${pom.version} - - - - diff --git a/hamcrest-parent-1.1.pom b/hamcrest-parent-1.1.pom deleted file mode 100644 index 8ec7448..0000000 --- a/hamcrest-parent-1.1.pom +++ /dev/null @@ -1,170 +0,0 @@ - - 4.0.0 - org.hamcrest - hamcrest-parent - pom - 1.1 - Hamcrest Parent - - 2006 - - Hamcrest - http://code.google.com/p/hamcrest - - - - - BSD style - http://www.opensource.org/licenses/bsd-license.php - repo - - - - - scm:svn:https://hamcrest.googlecode.com/svn/tags/hamcrest-packaging-maven-1.1 - https://hamcrest.googlecode.com/svn/tags/hamcrest-packaging-maven-1.1 - - - - hamcrest-all - hamcrest-core - hamcrest-generator - hamcrest-integration - hamcrest-library - - - - - - - - jmock - jmock - 1.1.0 - provided - - - junit - junit - 4.0 - provided - - - org.easymock - easymock - 2.2 - provided - - - - - - - jmock - jmock - - - junit - junit - - - org.easymock - easymock - - - - - - - hamcrest@repo1.maven.org - Central Maven Repository - scp://repo1.maven.org/home/projects/hamcrest/repository - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.1 - - - false - - - - - org.codehaus.mojo.groovy - groovy-maven-plugin - 1.0-alpha-3 - - - generate-resources - - execute - - - - - def ant = new AntBuilder() - def script = "${basedir}/src/script/download-jars.sh" - def version = "${release.version}" - if ( version == "null" ){ - println("ERROR: 'release.version' property not set.") - } else { - println("Using release version ${release.version}") - } - if ( new File(script).exists() ){ - // we are in top-level module - println("Found script "+script) - ant.exec(executable: script, dir: "${basedir}", - spawn: false, failifexecutionfails: true, failonerror: true){ - arg(value: "http://hamcrest.googlecode.com/files/") - arg(value: "hamcrest-${release.version}.zip" ) - arg(value: "target") - arg(value: "hamcrest-${release.version}") - } - } else { - // we are in child module - ant.copy(file: "${download.artifact.dir}/${artifact.name}.jar", - tofile: "${project.build.directory}/downloaded.jar", verbose: true) - ant.unjar(src: "${project.build.directory}/downloaded.jar", - dest: "${project.build.outputDirectory}") - } - - - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.0-beta-6 - - true - https://hamcrest.googlecode.com/svn/tags - - - - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-2 - - - - - - 1.1 - target - hamcrest-${release.version} - ${artifactId}-${release.version} - ${basedir}/../${download.dir}/${download.name}/${download.name} - - - \ No newline at end of file diff --git a/hamcrest-text-1.1.pom b/hamcrest-text-1.1.pom deleted file mode 100644 index 27beb20..0000000 --- a/hamcrest-text-1.1.pom +++ /dev/null @@ -1,20 +0,0 @@ - - 4.0.0 - - org.hamcrest - hamcrest-parent - 1.1 - - hamcrest-text - jar - Hamcrest Text - - - - ${pom.groupId} - hamcrest-core - ${pom.version} - - - - diff --git a/java-hamcrest-1.1-build.patch b/java-hamcrest-1.1-build.patch deleted file mode 100644 index 8321c66..0000000 --- a/java-hamcrest-1.1-build.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- hamcrest-1.1/build.xml 2007-06-30 15:03:43.000000000 +0200 -+++ hamcrest-1.1/build.xml-gil 2009-03-06 13:46:42.000000000 +0100 -@@ -26,17 +26,17 @@ - - -+ classpath="lib/generator/jarjar.jar"/> - - - -- -+ - - -@@ -94,16 +94,16 @@ - classpath="build/hamcrest-core-${version}.jar"/> - - -- -- -- -- -+ -+ -+ -+ - -@@ -121,7 +121,7 @@ - destjar="build/hamcrest-unit-test-${version}.jar" - classpath=" - build/hamcrest-core-${version}.jar; -- build/hamcrest-library-${version}.jar; -+ build/hamcrest-library-${version}.jar; - build/hamcrest-text-${version}.jar; - build/hamcrest-integration-${version}.jar; - build/hamcrest-generator-${version}.jar"/> -@@ -164,7 +164,7 @@ - - - -- -+ - - - -@@ -211,7 +211,7 @@ - - - -+ > - - - -@@ -221,9 +221,10 @@ - - - -- -+ - -- -+ -+ - - - -@@ -261,4 +262,4 @@ - - - -- -+ diff --git a/java-hamcrest.spec b/java-hamcrest.spec index 63c857f..4453320 100644 --- a/java-hamcrest.spec +++ b/java-hamcrest.spec @@ -1,41 +1,20 @@ +%define libname hamcrest Name: java-hamcrest -Version: 1.1 -Release: 4mamba +Version: 1.3 +Release: 1mamba Summary: Hamcrest - library of matchers for building test expressions Group: Development/Tools Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://code.google.com/p/hamcrest/ -Source0: http://hamcrest.googlecode.com/files/hamcrest-%{version}.tgz -Source1: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-parent/%{version}/hamcrest-parent-%{version}.pom -Source2: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-library/%{version}/hamcrest-library-%{version}.pom -Source3: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-integration/%{version}/hamcrest-integration-%{version}.pom -Source4: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-generator/%{version}/hamcrest-generator-%{version}.pom -Source5: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/%{version}/hamcrest-core-%{version}.pom -Source6: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/%{version}/hamcrest-all-%{version}.pom -Source7: hamcrest-text-1.1.pom -Source8: hamcrest-core-1.1-MANIFEST.MF -Patch0: java-hamcrest-1.1-build.patch +Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hamcrest/hamcrest-core-%{version}.jar +Source1: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hamcrest/hamcrest-library-%{version}.jar +Source2: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hamcrest/hamcrest-generator-%{version}.jar +Source3: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/hamcrest/hamcrest-integration-%{version}.jar License: BSD -BuildRequires: java-qdox16 -BuildRequires: java-jmock1 -BuildRequires: java-easymock2 -# with tests -# testng 4.6 eclipse plugin -%if "%{stage1}" != "1" -BuildRequires: java-junit45 -%endif -BuildRequires: java-jarjar1 -BuildRequires: java-testng -BuildRequires: apache-ant -BuildRequires: apache-ant-junit -BuildRequires: java-junit3 -BuildRequires: jpackage-utils -Requires: jpackage-utils -Requires: java-easymock2 -Requires: java-jmock1 -Requires: java-qdox16 +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -64,123 +43,22 @@ Typical scenarios include testing frameworks, mocking libraries and UI validatio This package contains javadoc for %{name}. %prep -%setup -q -n hamcrest-%{version} - -for j in $(find . -name "*.jar"); do - mv $j ${j}.no -done - -pushd lib - pushd generator - ln -sf $(build-classpath jarjar1) jarjar.jar - ln -sf $(build-classpath qdox16) qdox.jar - popd -# with integration - pushd integration - ln -sf $(build-classpath easymock2) easymock-2.2.jar - ln -sf $(build-classpath jmock1) jmock-1.10RC1.jar - ln -sf $(build-classpath junit-3.8.2) junit-3.8.1.jar - ln -sf $(build-classpath junit45) junit-4.0.jar - ln -sf $(build-classpath testng-jdk15) testng-4.6-jdk15.jar - popd -popd - -%patch0 -p1 - -perl -pi -e 's/\r$//g' LICENSE.txt README.txt %build -%if "%{stage1}" != "1" -export CLASSPATH=$(build-classpath jarjar1 qdox16 ant/ant-junit):$PWD/build/hamcrest-core-%{version}.jar -%else -rm -f lib/integration/junit-4.0.jar -mv lib/integration/junit-4.0.jar.no lib/integration/junit-4.0.jar -export CLASSPATH=$(build-classpath qdox16 ant/ant-junit):$PWD/build/hamcrest-core-%{version}.jar -%endif -ant \ - -Dant.build.javac.source=1.5 \ - -Dversion=%{version} \ - -Dbuild.sysclasspath=first \ - clean package javadoc - -mkdir -p META-INF -cp -p %{SOURCE8} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u build/hamcrest-core-%{version}.jar META-INF/MANIFEST.MF %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -mkdir -p %{buildroot}%{_javadir}/hamcrest -mkdir -p %{buildroot}%{_datadir}/maven2/poms +install -dm755 %{buildroot}%{_javadir}/%{libname} +cp %{SOURCE0} %{buildroot}%{_javadir}/%{libname}/core-%{version}.jar +cp %{SOURCE1} %{buildroot}%{_javadir}/%{libname}/library-%{version}.jar +cp %{SOURCE2} %{buildroot}%{_javadir}/%{libname}/generator-%{version}.jar +cp %{SOURCE3} %{buildroot}%{_javadir}/%{libname}/integration-%{version}.jar -install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-parent.pom -%add_to_maven_depmap org.hamcrest hamcrest-parent %{version} JPP/hamcrest parent - -install -m 644 build/hamcrest-all-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/all-%{version}.jar - -install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-all.pom -%add_to_maven_depmap org.hamcrest hamcrest-all %{version} JPP/hamcrest all - -install -m 644 build/hamcrest-core-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/core-%{version}.jar - -install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-core.pom -%add_to_maven_depmap org.hamcrest hamcrest-core %{version} JPP/hamcrest core - -install -m 644 build/hamcrest-generator-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/generator-%{version}.jar - -install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-generator.pom -%add_to_maven_depmap org.hamcrest hamcrest-generator %{version} JPP/hamcrest generator - -install -m 644 build/hamcrest-library-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/library-%{version}.jar - -install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-library.pom -%add_to_maven_depmap org.hamcrest hamcrest-library %{version} JPP/hamcrest library - -install -m 644 build/hamcrest-text-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/text-%{version}.jar - -install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-text.pom -%add_to_maven_depmap org.hamcrest hamcrest-text %{version} JPP/hamcrest text - -# with integration -install -m 644 build/hamcrest-integration-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/integration-%{version}.jar - -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/maven2/poms/JPP.hamcrest-integration.pom -%add_to_maven_depmap org.hamcrest hamcrest-integration %{version} JPP/hamcrest integration - -# with tests -install -m 644 build/hamcrest-unit-test-%{version}.jar \ - %{buildroot}%{_javadir}/hamcrest/unit-test-%{version}.jar - - -( - cd %{buildroot}%{_javadir}/hamcrest - for jar in *-%{version}.jar; do - ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"` - done -) - -mkdir -p %{buildroot}%{_javadocdir}/hamcrest-%{version} -cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/hamcrest-%{version} -ln -s hamcrest-%{version} %{buildroot}%{_javadocdir}/hamcrest - - -mkdir -p %{buildroot}%{_datadir}/hamcrest-%{version} -# with integration -install -m 644 build/hamcrest-examples-%{version}.jar \ - %{buildroot}%{_datadir}/hamcrest-%{version} - -cp -pr hamcrest-examples %{buildroot}%{_datadir}/hamcrest-%{version}/ -ln -s hamcrest-%{version} %{buildroot}%{_datadir}/hamcrest - - -#%{_bindir}/aot-compile-rpm +for j in core library generator integration; do + ln -s ${j}-%{version}.jar %{buildroot}%{_javadir}/%{libname}/${j}.jar + ln -s %{libname}/${j}-%{version}.jar %{buildroot}%{_javadir}/%{libname}-${j}.jar +done %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -188,35 +66,27 @@ ln -s hamcrest-%{version} %{buildroot}%{_datadir}/hamcrest %files %defattr(-,root,root) %dir %{_javadir}/hamcrest -%{_javadir}/hamcrest/all-%{version}.jar -%{_javadir}/hamcrest/all.jar +%{_javadir}/hamcrest-core.jar %{_javadir}/hamcrest/core-%{version}.jar %{_javadir}/hamcrest/core.jar +%{_javadir}/hamcrest-generator.jar %{_javadir}/hamcrest/generator-%{version}.jar %{_javadir}/hamcrest/generator.jar +%{_javadir}/hamcrest-integration.jar %{_javadir}/hamcrest/integration-%{version}.jar %{_javadir}/hamcrest/integration.jar +%{_javadir}/hamcrest-library.jar %{_javadir}/hamcrest/library-%{version}.jar %{_javadir}/hamcrest/library.jar -%{_javadir}/hamcrest/text-%{version}.jar -%{_javadir}/hamcrest/text.jar -%{_javadir}/hamcrest/unit-test-%{version}.jar -%{_javadir}/hamcrest/unit-test.jar -%{_datadir}/maven2/poms -%{_mavendepmapfragdir} -%doc LICENSE.txt README.txt - -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/hamcrest-%{version} -%{_javadocdir}/hamcrest - -%files demo -%defattr(-,root,root) -%{_datadir}/hamcrest-%{version} -%{_datadir}/hamcrest +#%{_javadir}/hamcrest/text-%{version}.jar +#%{_javadir}/hamcrest/text.jar +#%{_javadir}/hamcrest/unit-test-%{version}.jar +#%{_javadir}/hamcrest/unit-test.jar %changelog +* Wed Aug 08 2018 Silvan Calarco 1.3-1mamba +- update to 1.3 + * Thu Nov 25 2010 gil 1.1-4mamba - rebuilt devel