commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2019-10-05 16:15:55
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new.2352 (New)
Package is "hamcrest"
Sat Oct 5 16:15:55 2019 rev:25 rq:734747 version:1.3
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2019-02-04
21:18:01.679722613 +0100
+++ /work/SRC/openSUSE:Factory/.hamcrest.new.2352/hamcrest.changes
2019-10-05 16:16:01.478106013 +0200
@@ -1,0 +2,8 @@
+Wed Oct 2 20:24:49 UTC 2019 - Fridrich Strba
+
+- Remove references to the hamcrest-parent pom and do not
+ distribute it
+ * useless since we don't build with maven
+ * creates problems with gradle connector
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.bfKLuQ/_old 2019-10-05 16:16:03.714100190 +0200
+++ /var/tmp/diff_new_pack.bfKLuQ/_new 2019-10-05 16:16:03.734100138 +0200
@@ -130,8 +130,14 @@
# jars
install -d -m 755 %{buildroot}%{_javadir}/%{name}
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
-install -m 644 pom/%{name}-parent.pom
%{buildroot}%{_mavenpomdir}/%{name}/parent.pom
-%add_maven_depmap %{name}/parent.pom -f core
+
+rm -f pom/%{name}-parent.pom
+for i in pom/%{name}*.pom; do
+ %pom_remove_parent ${i}
+ %pom_xpath_inject "pom:project" "
+ org.hamcrest
+ %{version}" ${i}
+done
install -m 644 build/%{name}-core-%{version}.jar
%{buildroot}%{_javadir}/%{name}/core.jar
install -m 644 pom/%{name}-core.pom
%{buildroot}%{_mavenpomdir}/%{name}/core.pom
@@ -162,28 +168,13 @@
install -d -m 755 %{buildroot}%{_datadir}/%{name}
cp -pr %{name}-examples %{buildroot}%{_datadir}/%{name}/
-%files
+%files -f .mfiles
%defattr(0644,root,root,0755)
%license LICENSE.txt
-%{_javadir}/%{name}/all.jar
-%{_javadir}/%{name}/generator.jar
-%{_javadir}/%{name}/integration.jar
-%{_javadir}/%{name}/library.jar
-%{_mavenpomdir}/%{name}/all.pom
-%{_mavenpomdir}/%{name}/generator.pom
-%{_mavenpomdir}/%{name}/integration.pom
-%{_mavenpomdir}/%{name}/library.pom
-%{_datadir}/maven-metadata/%{name}.xml*
-%files core
+%files core -f .mfiles-core
%defattr(0644,root,root,0755)
%license LICENSE.txt
-%dir %{_javadir}/%{name}
-%dir %{_mavenpomdir}/%{name}
-%{_javadir}/%{name}/core.jar
-%{_mavenpomdir}/%{name}/parent.pom
-%{_mavenpomdir}/%{name}/core.pom
-%{_datadir}/maven-metadata/%{name}-core.xml*
%files javadoc
%defattr(0644,root,root,0755)
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2019-02-04 21:18:00
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new.28833 (New)
Package is "hamcrest"
Mon Feb 4 21:18:00 2019 rev:24 rq:666149 version:1.3
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2019-01-15
09:10:15.806575064 +0100
+++ /work/SRC/openSUSE:Factory/.hamcrest.new.28833/hamcrest.changes
2019-02-04 21:18:01.679722613 +0100
@@ -1,0 +2,5 @@
+Tue Jan 15 08:52:39 UTC 2019 - Fridrich Strba
+
+- Make jmock and easymock integration opt-in (bsc#1121956)
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.FdPpaQ/_old 2019-02-04 21:18:02.395722343 +0100
+++ /var/tmp/diff_new_pack.FdPpaQ/_new 2019-02-04 21:18:02.399722341 +0100
@@ -16,6 +16,8 @@
#
+%bcond_with jmock
+%bcond_with easymock
Name: hamcrest
Version:1.3
Release:0
@@ -39,12 +41,18 @@
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
-BuildRequires: jmock
BuildRequires: qdox >= 2.0
Requires: %{name}-core = %{version}-%{release}
-Requires: jmock
Requires: qdox >= 2.0
BuildArch: noarch
+%if %{with jmock}
+BuildRequires: jmock
+Requires: jmock
+%endif
+%if %{with easymock}
+BuildRequires: easymock
+Requires: easymock
+%endif
%description
Provides a library of matcher objects (also known as constraints or
@@ -80,11 +88,20 @@
%setup -q -n JavaHamcrest-%{name}-java-%{version}
find . -type f -name "*.jar" | xargs -t rm
-rm -fr
hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java
-rm -fr hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java
-# BUILD/hamcrest-1.1/lib/generator/qdox-1.6.1.jar.no
ln -sf $(build-classpath qdox) lib/generator/
+%if %{with jmock}
ln -sf $(build-classpath jmock) lib/integration/
+%else
+rm -fr
hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java
+rm -fr hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java
+rm -fr
hamcrest-unit-test/src/main/java/org/hamcrest/integration/JMock1AdapterTest.java
+%endif
+%if %{with easymock}
+ln -sf $(build-classpath easymock3) lib/integration/
+%else
+rm -fr
hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java
+rm -fr hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java
+%endif
%patch0 -p1
%patch1 -p1
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2019-01-15 09:10:13
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new.28833 (New)
Package is "hamcrest"
Tue Jan 15 09:10:13 2019 rev:23 rq:662845 version:1.3
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2017-12-22
12:16:47.360135433 +0100
+++ /work/SRC/openSUSE:Factory/.hamcrest.new.28833/hamcrest.changes
2019-01-15 09:10:15.806575064 +0100
@@ -1,0 +2,21 @@
+Fri Jan 4 16:13:17 UTC 2019 - Fridrich Strba
+
+- Use sources from github, which are accessible
+- Do not build the hamcrest-text empty jar
+- Split a core package off the main package
+- Added patch:
+ * hamcrest-1.3-qdox-2.0.patch
++ Fix build against QDox 2.0
+- Removed patch:
+ * hamcrest-1.3-no-integration.patch
++ Not needed any more since integration is buildable
+- Modified patches:
+ * hamcrest-1.3-build.patch
+ * hamcrest-1.3-fork-javac.patch
+ * hamcrest-1.3-javadoc.patch
+ * hamcrest-1.3-javadoc10.patch
+ * hamcrest-1.3-javadoc9.patch
+ * hamcrest-1.3-no-jarjar.patch
+ * hamcrest-1.3-random-build-crash.patch
+
+---
Old:
hamcrest-1.3-no-integration.patch
hamcrest-1.3.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-text-MANIFEST.MF
New:
hamcrest-1.3-qdox-2.0.patch
hamcrest-java-1.3.tar.gz
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.szo9X3/_old 2019-01-15 09:10:16.482574441 +0100
+++ /var/tmp/diff_new_pack.szo9X3/_new 2019-01-15 09:10:16.482574441 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hamcrest
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -22,44 +22,28 @@
Summary:Library of matchers for building test expressions
License:BSD-3-Clause
Group: Development/Libraries/Java
-Url:https://github.com/hamcrest/JavaHamcrest
-Source0:http://%{name}.googlecode.com/files/%{name}-%{version}.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
+URL:https://github.com/hamcrest/JavaHamcrest
+Source0:
https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-%{version}.tar.gz
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
-#PATCH-FIX-OPENSUSE: don't use versioned deps, no overview in html
Patch0: %{name}-%{version}-build.patch
-#PATCH-FIX-OPENSUSE: don't bundle QDox classes into hamcrest-generator.jar
Patch1: %{name}-%{version}-no-jarjar.patch
-#PATCH-FIX-OPENSUSE: don't build hamcrest-integration.jar
-Patch2: %{name}-%{version}-no-integration.patch
-#PATCH-FIX-OPENSUSE: there is no hamcrest-generator-nodeps
Patch3: %{name}-%{version}-javadoc.patch
-#PATCH-FIX-UPSTREAM: random build crash fix
-Patch4: hamcrest-1.3-random-build-crash.patch
-Patch5: hamcrest-1.3-fork-javac.patch
-Patch6: hamcrest-1.3-javadoc9.patch
-Patch7: hamcrest-1.3-javadoc10.patch
-BuildRequires: ant >= 1.6.5
-BuildRequires: java-devel >= 1.6.0
+Patch4: %{name}-%{v
commit hamcrest for openSUSE:Factory
Hello community, here is the log from the commit of package hamcrest for openSUSE:Factory checked in at 2017-12-22 12:16:46 Comparing /work/SRC/openSUSE:Factory/hamcrest (Old) and /work/SRC/openSUSE:Factory/.hamcrest.new (New) Package is "hamcrest" Fri Dec 22 12:16:46 2017 rev:22 rq:557934 version:1.3 Changes: --- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2017-09-13 22:19:51.880050736 +0200 +++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2017-12-22 12:16:47.360135433 +0100 @@ -1,0 +2,8 @@ +Mon Dec 18 06:53:19 UTC 2017 - fst...@suse.com + +- Added patch: + * hamcrest-1.3-javadoc10.patch ++ Fix build with jdk10's javadoc that ends in error when a + link cannot be downloaded + +--- New: hamcrest-1.3-javadoc10.patch Other differences: -- ++ hamcrest.spec ++ --- /var/tmp/diff_new_pack.ltRH6F/_old 2017-12-22 12:16:48.416083946 +0100 +++ /var/tmp/diff_new_pack.ltRH6F/_new 2017-12-22 12:16:48.416083946 +0100 @@ -50,6 +50,7 @@ Patch4: hamcrest-1.3-random-build-crash.patch Patch5: hamcrest-1.3-fork-javac.patch Patch6: hamcrest-1.3-javadoc9.patch +Patch7: hamcrest-1.3-javadoc10.patch BuildRequires: ant >= 1.6.5 BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local @@ -98,6 +99,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 perl -pi -e 's/\r$//g' LICENSE.txt ++ hamcrest-1.3-javadoc10.patch ++ --- hamcrest-1.3/build.xml 2012-07-02 21:14:09.0 +0200 +++ hamcrest-1.3/build.xml 2017-12-18 07:46:06.290074242 +0100 @@ -165,9 +165,6 @@ - -http://www.junit.org/junit/javadoc/3.8.1/"/> -http://kentbeck.github.com/junit/javadoc/latest/"/>
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2017-09-13 22:19:49
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Wed Sep 13 22:19:49 2017 rev:21 rq:522232 version:1.3
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2017-05-31
13:32:43.499134396 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2017-09-13
22:19:51.880050736 +0200
@@ -1,0 +2,13 @@
+Fri Sep 8 06:05:24 UTC 2017 - fst...@suse.com
+
+- Modified patch:
+ * hamcrest-1.3-fork-javac.patch
++ Specify java target level 1.6 in order to allow building
+ with jdk9
+- Specify java source level 1.6 in order to allow building with
+ jdk9
+- Added patch:
+ * hamcrest-1.3-javadoc9.patch
++ fix javadoc errors that are fatal in jdk9
+
+---
New:
hamcrest-1.3-javadoc9.patch
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.SGh7sH/_old 2017-09-13 22:19:52.707934184 +0200
+++ /var/tmp/diff_new_pack.SGh7sH/_new 2017-09-13 22:19:52.711933621 +0200
@@ -49,6 +49,7 @@
#PATCH-FIX-UPSTREAM: random build crash fix
Patch4: hamcrest-1.3-random-build-crash.patch
Patch5: hamcrest-1.3-fork-javac.patch
+Patch6: hamcrest-1.3-javadoc9.patch
BuildRequires: ant >= 1.6.5
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local
@@ -96,12 +97,13 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
perl -pi -e 's/\r$//g' LICENSE.txt
%build
export CLASSPATH=$(build-classpath qdox)
-ant -Dant.build.javac.source=1.5 -Dversion=%{version}
-Dbuild.sysclasspath=last clean core generator library bigjar javadoc
+ant -Dant.build.javac.source=1.6 -Dversion=%{version}
-Dbuild.sysclasspath=last clean core generator library bigjar javadoc
# inject OSGi manifests
mkdir -p META-INF
++ hamcrest-1.3-fork-javac.patch ++
--- /var/tmp/diff_new_pack.SGh7sH/_old 2017-09-13 22:19:52.735930243 +0200
+++ /var/tmp/diff_new_pack.SGh7sH/_new 2017-09-13 22:19:52.739929679 +0200
@@ -16,7 +16,7 @@
-
-+
++
++ hamcrest-1.3-javadoc9.patch ++
1144 lines (skipped)
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2017-05-31 13:32:41
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Wed May 31 13:32:41 2017 rev:20 rq:499447 version:1.3
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2015-04-02
15:55:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2017-05-31
13:32:43.499134396 +0200
@@ -1,0 +2,12 @@
+Mon May 29 16:05:25 UTC 2017 - tchva...@suse.com
+
+- Apply patch from fedora:
+ * hamcrest-1.3-fork-javac.patch
+
+---
+Fri May 19 13:11:37 UTC 2017 - tchva...@suse.com
+
+- Fix homepage
+- Update to build with new javapacakges-tools
+
+---
New:
hamcrest-1.3-fork-javac.patch
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.OH0fd8/_old 2017-05-31 13:32:44.854943285 +0200
+++ /var/tmp/diff_new_pack.OH0fd8/_new 2017-05-31 13:32:44.854943285 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hamcrest
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,32 +16,13 @@
#
-%define _without_integration 1
-%define _without_tests 1
-%define _withouth_jarjar 1
-
-# This option controls integration which requires easymock2 and jmock and junit
-%bcond_without integration
-
-# This option controls jarjar on qdox
-# Since bundling the qdox classes prevents upgrades, we disable it by default
-%bcond_with jarjar
-
-# This option controls tests which requires ant-junit and testng
-%bcond_without tests
-
-# If integration is disabled, then tests are disabled
-%if %without integration
-%bcond_with tests
-%endif
-
Name: hamcrest
Version:1.3
Release:0
Summary:Library of matchers for building test expressions
License:BSD-3-Clause
Group: Development/Libraries/Java
-Url:http://code.google.com/p/%{name}/
+Url:https://github.com/hamcrest/JavaHamcrest
Source0:http://%{name}.googlecode.com/files/%{name}-%{version}.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
@@ -52,13 +33,11 @@
# 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
-
#PATCH-FIX-OPENSUSE: don't use versioned deps, no overview in html
Patch0: %{name}-%{version}-build.patch
#PATCH-FIX-OPENSUSE: don't bundle QDox classes into hamcrest-generator.jar
@@ -69,33 +48,15 @@
Patch3: %{name}-%{version}-javadoc.patch
#PATCH-FIX-UPSTREAM: random build crash fix
Patch4: hamcrest-1.3-random-build-crash.patch
-
-Requires: java >= 1.6.0
-Requires: qdox
-%if %with integration
-Requires: easymock2
-Requires: jmock
-%endif
-
+Patch5: hamcrest-1.3-fork-javac.patch
BuildRequires: ant >= 1.6.5
BuildRequires: java-devel >= 1.6.0
+BuildRequires: javapackages-local
BuildRequires: javapackages-tools
-BuildRequires: zip
-%if %with integration
-BuildRequires: easymock2
-%endif
-%if %with jarjar
-BuildRequires: jarjar
-%endif
-%if %with integration
-BuildRequires: ant-junit
-BuildRequires: jmock
-BuildRequires: junit
-%endif
BuildRequires: qdox
-%if %with tests
-BuildRequires: testng
-%endif
+BuildRequires: zip
+Requires: java >= 1.6.0
+Requires: qdox
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -105,8 +66,6 @@
used in other frameworks. Typical scenarios include testing frameworks,
mocking libraries and UI validation rules.
-
-
%package javadoc
Summary:Javadoc for %{name}
Group: Documentation/HTML
@@ -119,9 +78,6 @@
Group: Development/Libraries/Java
Requires: %{name} = %{version}
Requires: junit
-%if %with tests
-Requires: testng
-%endif
%description demo
Demo files for %{name}.
@@ -132,48 +88,19 @@
rm -fr
hamcrest-integration/src/main/java/org/hamcrest/integratio
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2015-04-02 15:55:56
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2014-07-16
16:49:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2015-04-02
15:55:57.0 +0200
@@ -1,0 +2,5 @@
+Wed Mar 18 09:46:07 UTC 2015 - tchva...@suse.com
+
+- Fix build with new javapackages-tools
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.v3z5bZ/_old 2015-04-02 15:55:58.0 +0200
+++ /var/tmp/diff_new_pack.v3z5bZ/_new 2015-04-02 15:55:58.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hamcrest
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -267,7 +267,7 @@
%{_javadir}/%{name}/unit-test.jar
%endif
%{_mavenpomdir}/*
-%config %{_mavendepmapfragdir}/*
+%{_datadir}/maven-metadata/%{name}.xml*
%files javadoc
%defattr(0644,root,root,0755)
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2014-07-16 16:49:43
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2014-06-19
13:19:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2014-07-16
16:49:53.0 +0200
@@ -1,0 +2,5 @@
+Mon Jul 7 15:02:47 UTC 2014 - tchva...@suse.com
+
+- Use junit not junit4
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.q1j0bw/_old 2014-07-16 16:49:55.0 +0200
+++ /var/tmp/diff_new_pack.q1j0bw/_new 2014-07-16 16:49:55.0 +0200
@@ -118,7 +118,7 @@
Summary:Demo files for %{name}
Group: Development/Libraries/Java
Requires: %{name} = %{version}
-Requires: junit4
+Requires: junit
%if %with tests
Requires: testng
%endif
@@ -148,7 +148,7 @@
# BUILD/%{name}-%{version}/lib/integration/junit-3.8.1.jar.no
ln -sf $(build-classpath junit) lib/integration/
# BUILD/%{name}-%{version}/lib/integration/junit-4.0.jar.no
-#ln -sf $(build-classpath junit4) lib/integration/
+#ln -sf $(build-classpath junit) lib/integration/
%endif
# BUILD/%{name}-%{version}/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2014-06-19 13:19:41
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2013-10-30
15:37:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2014-06-19
13:19:44.0 +0200
@@ -1,0 +2,6 @@
+Mon Jun 16 12:25:07 UTC 2014 - tchva...@suse.com
+
+- Add patch to fix random build errors by enforcing single thread.
+ * hamcrest-1.3-random-build-crash.patch
+
+---
New:
hamcrest-1.3-random-build-crash.patch
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.9zld4W/_old 2014-06-19 13:19:45.0 +0200
+++ /var/tmp/diff_new_pack.9zld4W/_new 2014-06-19 13:19:45.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hamcrest
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -67,6 +67,8 @@
Patch2: %{name}-%{version}-no-integration.patch
#PATCH-FIX-OPENSUSE: there is no hamcrest-generator-nodeps
Patch3: %{name}-%{version}-javadoc.patch
+#PATCH-FIX-UPSTREAM: random build crash fix
+Patch4: hamcrest-1.3-random-build-crash.patch
Requires: java >= 1.6.0
Requires: qdox
@@ -161,6 +163,7 @@
%patch2 -p1
%endif
%patch3 -p1
+%patch4 -p1
perl -pi -e 's/\r$//g' LICENSE.txt
++ hamcrest-1.3-random-build-crash.patch ++
diff -urN hamcrest-1.3.old/build.xml hamcrest-1.3/build.xml
--- hamcrest-1.3.old/build.xml 2014-06-16 13:00:29.321699344 +0200
+++ hamcrest-1.3/build.xml 2014-06-16 14:24:30.160165471 +0200
@@ -27,6 +27,7 @@
+
@@ -36,7 +37,7 @@
fork="yes"
failonerror="yes"
classpath="
-build/hamcrest-core-${version}.jar;
+build/temp/hamcrest-core-${version}.jar.contents;
build/hamcrest-generator-${version}.jar;
">
@@ -48,11 +49,13 @@
+
+
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2013-10-30 15:37:08
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2013-10-22
14:52:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2013-10-30
15:37:09.0 +0100
@@ -1,0 +2,5 @@
+Tue Oct 29 12:51:11 UTC 2013 - mvysko...@suse.com
+
+- drop junit from dependencies, it's not needed and cause a build cycle
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.3tAUhT/_old 2013-10-30 15:37:12.0 +0100
+++ /var/tmp/diff_new_pack.3tAUhT/_new 2013-10-30 15:37:12.0 +0100
@@ -20,7 +20,7 @@
%define _without_tests 1
%define _withouth_jarjar 1
-# This option controls integration which requires easymock2 and jmock
+# This option controls integration which requires easymock2 and jmock and junit
%bcond_without integration
# This option controls jarjar on qdox
@@ -76,7 +76,6 @@
%endif
BuildRequires: ant >= 1.6.5
-#BuildRequires: ant-junit
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: zip
@@ -87,15 +86,10 @@
BuildRequires: jarjar
%endif
%if %with integration
+BuildRequires: ant-junit
BuildRequires: jmock
-%endif
BuildRequires: junit
-#FIXME: build with junit4 once we will update junit4 to 4.11
-# and remove bundled hamcrest parts, prevents us to build
-# hamcrest itself
-#BuildRequires: junit4
-#junit4 does require hamcrest, but we don't need it for building itself
-#!BuildIgnore: hamcrest
+%endif
BuildRequires: qdox
%if %with tests
BuildRequires: testng
@@ -149,11 +143,11 @@
# BUILD/%{name}-%{version}/lib/integration/jmock-%{version}0RC1.jar.no
%if %with integration
ln -sf $(build-classpath jmock) lib/integration/
-%endif
# BUILD/%{name}-%{version}/lib/integration/junit-3.8.1.jar.no
ln -sf $(build-classpath junit) lib/integration/
# BUILD/%{name}-%{version}/lib/integration/junit-4.0.jar.no
#ln -sf $(build-classpath junit4) lib/integration/
+%endif
# BUILD/%{name}-%{version}/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
ln -sf $(build-classpath testng-jdk15) lib/integration/
@@ -172,7 +166,9 @@
%build
export CLASSPATH=$(build-classpath qdox)
+%if %with integration
export OPT_JAR_LIST="junit ant/ant-junit"
+%endif
# 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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2013-10-22 14:51:58
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2013-09-12
17:05:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2013-10-22
14:52:04.0 +0200
@@ -1,0 +2,16 @@
+Mon Oct 21 11:34:31 UTC 2013 - mvysko...@suse.com
+
+- Update to 1.3
+ bugfix and feature update, see CHANGES.txt for details
+- Removed patches
+ * hamcrest-1.1-build.patch
++ renamed to hamcrest-1.3-build.patch
+ * hamcrest-1.1-no-jarjar.patch
++ renamed to hamcrest-1.3-no-jarjar.patch
+ * hamcrest-1.1-no-integration.patch
++ renamed to hamcrest-1.3-no-integration.patch
+- Added patches
+ * hamcrest-1.3-javadoc.patch
+- Updated poms and added OSGI manifests from Fedora
+
+---
Old:
hamcrest-1.1-build.patch
hamcrest-1.1-no-integration.patch
hamcrest-1.1-no-jarjar.patch
hamcrest-1.1.tar.bz2
hamcrest-all-1.1.pom
hamcrest-core-1.1.pom
hamcrest-generator-1.1.pom
hamcrest-integration-1.1.pom
hamcrest-library-1.1.pom
hamcrest-parent-1.1.pom
hamcrest-text-1.1.pom
New:
hamcrest-1.3-build.patch
hamcrest-1.3-javadoc.patch
hamcrest-1.3-no-integration.patch
hamcrest-1.3-no-jarjar.patch
hamcrest-1.3.tgz
hamcrest-all-1.3.pom
hamcrest-core-1.3.pom
hamcrest-core-MANIFEST.MF
hamcrest-generator-1.3.pom
hamcrest-generator-MANIFEST.MF
hamcrest-integration-1.3.pom
hamcrest-integration-MANIFEST.MF
hamcrest-library-1.3.pom
hamcrest-library-MANIFEST.MF
hamcrest-parent-1.3.pom
hamcrest-text-1.3.pom
hamcrest-text-MANIFEST.MF
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.pWorON/_old 2013-10-22 14:52:07.0 +0200
+++ /var/tmp/diff_new_pack.pWorON/_new 2013-10-22 14:52:07.0 +0200
@@ -19,46 +19,67 @@
%define _without_integration 1
%define _without_tests 1
%define _withouth_jarjar 1
+
# This option controls integration which requires easymock2 and jmock
%bcond_without integration
+
# This option controls jarjar on qdox
# Since bundling the qdox classes prevents upgrades, we disable it by default
%bcond_with jarjar
+
# This option controls tests which requires ant-junit and testng
%bcond_without tests
+
# If integration is disabled, then tests are disabled
%if %without integration
%bcond_with tests
%endif
Name: hamcrest
-Version:1.1
+Version:1.3
Release:0
Summary:Library of matchers for building test expressions
License:BSD-3-Clause
Group: Development/Libraries/Java
-Url:http://code.google.com/p/hamcrest/
-Source0:http://hamcrest.googlecode.com/files/hamcrest-1.1.tar.bz2
-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
-Patch0: hamcrest-1.1-build.patch
-Patch1: hamcrest-1.1-no-jarjar.patch
-Patch2: hamcrest-1.1-no-integration.patch
-Requires: java >= 1.5.0
+Url:http://code.google.com/p/%{name}/
+Source0:http://%{name}.googlecode.com/files/%{name}-%{version}.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:%{na
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2013-09-12 17:05:17
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2013-09-09
13:05:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2013-09-12
17:05:18.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 9 11:05:43 UTC 2013 - tchva...@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.A8uou1/_old 2013-09-12 17:05:21.0 +0200
+++ /var/tmp/diff_new_pack.A8uou1/_new 2013-09-12 17:05:21.0 +0200
@@ -58,7 +58,7 @@
BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit
BuildRequires: java-devel >= 1.5.0
-BuildRequires: jpackage-utils >= 1.7.4
+BuildRequires: javapackages-tools
%if %with integration
BuildRequires: easymock2
%endif
@@ -76,7 +76,7 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-PreReq: jpackage-utils >= 1.7.4
+PreReq: javapackages-tools
%description
Provides a library of matcher objects (also known as constraints or
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2013-09-09 13:05:54
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest"
Changes:
--- /work/SRC/openSUSE:Factory/hamcrest/hamcrest.changes2011-09-23
02:02:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.hamcrest.new/hamcrest.changes 2013-09-09
13:05:55.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 3 14:23:47 UTC 2013 - mvysko...@suse.com
+
+- use add_maven_depmap from javapackages-tools
+- install non-versioned dirs and jars
+
+---
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.FL4WTe/_old 2013-09-09 13:05:55.0 +0200
+++ /var/tmp/diff_new_pack.FL4WTe/_new 2013-09-09 13:05:55.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package hamcrest (Version 1.1)
+# spec file for package hamcrest
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,6 @@
#
-%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
%define _without_integration 1
%define _without_tests 1
%define _withouth_jarjar 1
@@ -37,11 +33,11 @@
Name: hamcrest
Version:1.1
-Release:2
+Release:0
Summary:Library of matchers for building test expressions
License:BSD-3-Clause
-Url:http://code.google.com/p/hamcrest/
Group: Development/Libraries/Java
+Url:http://code.google.com/p/hamcrest/
Source0:http://hamcrest.googlecode.com/files/hamcrest-1.1.tar.bz2
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
@@ -59,10 +55,10 @@
Requires: jmock
%endif
Requires: qdox
-BuildRequires: jpackage-utils >= 1.7.4
-BuildRequires: java-devel >= 1.5.0
BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit
+BuildRequires: java-devel >= 1.5.0
+BuildRequires: jpackage-utils >= 1.7.4
%if %with integration
BuildRequires: easymock2
%endif
@@ -91,9 +87,8 @@
%package javadoc
-License:BSD-3-Clause
-Group: Development/Libraries/Java
Summary:Library of matchers for building test expressions
+Group: Development/Libraries/Java
%description javadoc
Provides a library of matcher objects (also known as constraints or
@@ -104,9 +99,8 @@
%package demo
-License:BSD-3-Clause
-Group: Development/Libraries/Java
Summary:Library of matchers for building test expressions
+Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
Requires: junit
#Requires: junit4
@@ -167,90 +161,75 @@
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 %{SOURCE1}
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
-%add_to_maven_depmap org.hamcrest %{name}-parent %{version} JPP/%{name} parent
-install -m 644 build/%{name}-all-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}/all-%{version}.jar
-install -m 644 %{SOURCE6}
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-all.pom
-%add_to_maven_depmap org.hamcrest %{name}-all %{version} JPP/%{name} all
-install -m 644 build/%{name}-core-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
-install -m 644 %{SOURCE5}
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
-%add_to_maven_depmap org.hamcrest %{name}-core %{version} JPP/%{name} core
-install -m 644 build/%{name}-generator-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}/generator-%{version}.jar
-install -m 644 %{SOURCE4}
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-generator.pom
-%add_to_maven_depmap org.hamcrest %{name}-generator %{version} JPP/%{name}
generator
-install -m 644 build/%{name}-library-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}/library-%{version}.jar
-install -m 644 %{SOURCE2}
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-library.pom
-%add_to_maven_depmap org.hamcrest %{name}-library %{version} JPP/%{name}
library
+
commit hamcrest for openSUSE:Factory
Hello community,
here is the log from the commit of package hamcrest for openSUSE:Factory
checked in at 2011-12-06 18:17:46
Comparing /work/SRC/openSUSE:Factory/hamcrest (Old)
and /work/SRC/openSUSE:Factory/.hamcrest.new (New)
Package is "hamcrest", Maintainer is "bnc-team-j...@forge.provo.novell.com"
Changes:
Other differences:
--
++ hamcrest.spec ++
--- /var/tmp/diff_new_pack.jRE4b2/_old 2011-12-06 18:27:59.0 +0100
+++ /var/tmp/diff_new_pack.jRE4b2/_new 2011-12-06 18:27:59.0 +0100
@@ -39,7 +39,7 @@
Version:1.1
Release:2
Summary:Library of matchers for building test expressions
-License:BSD 3-Clause
+License:BSD-3-Clause
Url:http://code.google.com/p/hamcrest/
Group: Development/Libraries/Java
Source0:http://hamcrest.googlecode.com/files/hamcrest-1.1.tar.bz2
@@ -91,7 +91,7 @@
%package javadoc
-License:BSD 3-Clause
+License:BSD-3-Clause
Group: Development/Libraries/Java
Summary:Library of matchers for building test expressions
@@ -104,7 +104,7 @@
%package demo
-License:BSD 3-Clause
+License:BSD-3-Clause
Group: Development/Libraries/Java
Summary:Library of matchers for building test expressions
Requires: %{name} = %{version}-%{release}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
