Hello community,
here is the log from the commit of package junit for openSUSE:Factory checked in at 2013-11-05 17:14:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/junit (Old)
and /work/SRC/openSUSE:Factory/.junit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/junit/junit.changes 2013-08-25 13:32:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.junit.new/junit.changes 2013-11-05 17:14:46.000000000 +0100
@@ -1,0 +2,16 @@
+Fri Oct 25 07:39:22 UTC 2013 - mvyskocil@suse.com
+
+- Update to 4.11
+ * Matchers: Upgrade to Hamcrest 1.3
+ no longer included junit jar
+ * Parameterized Tests
+ * Specify Test execution order
+ * New maven artifact 'junit:junit' w/o builtin hamcrest
+ * Number of improvements into Rules
+- Drop jdk7-testfailure.patch, fixed upstream
+- Add junit-no-hamcrest-src.patch, don't bundle hamcrest into junit.jar
+- Use SourceUrl for release tarball and pom
+- Don't inject OSGI manifest, it breaks junit.jar
+- Provide/obsolete package junit4
+
+-------------------------------------------------------------------
Old:
----
junit3.8.2-build.xml
junit3.8.2.zip
New:
----
junit-4.11.pom
junit-no-hamcrest-src.patch
r4.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ junit.spec ++++++
--- /var/tmp/diff_new_pack.i5mGEP/_old 2013-11-05 17:14:48.000000000 +0100
+++ /var/tmp/diff_new_pack.i5mGEP/_new 2013-11-05 17:14:48.000000000 +0100
@@ -14,100 +14,140 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# icecream 0
-%define name junit
-%define version 3.8.2
-%define release 4jpp
-%define section free
-
Name: junit
-BuildRequires: ant
-BuildRequires: java-1_5_0-gcj-compat-devel
-BuildRequires: unzip
-BuildRequires: xml-commons-apis
-Version: 3.8.2
+Version: 4.11
Release: 0
-Summary: Java Regression Test Package
-License: IPL-1.0
+Summary: Java regression test package
+License: CPL-1.0
Group: Development/Libraries/Java
Url: http://www.junit.org/
-Source: http://osdn.dl.sourceforge.net/junit/junit%{version}.zip
-Source1: %{name}%{version}-build.xml
+Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz
+#Source1: http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.p...
+Source1: junit-4.11.pom
+
+#PATCH-FIX-OPENSUSE: do not use bundled hamcrest sources, which btw fixes hamcrest build with junit4
+Patch0: junit-no-hamcrest-src.patch
+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%description
-JUnit is a regression testing framework written by Erich Gamma and Kent
-Beck. It is used by the developer who implements unit tests in Java.
-JUnit is open source software, released under the IBM Public License
-and hosted on SourceForge.
-
+BuildRequires: ant
+BuildRequires: hamcrest >= 1.3
+BuildRequires: java-devel >= 1.6.0
+BuildRequires: javapackages-tools
+BuildRequires: perl(Digest::MD5)
+
+Requires(post): javapackages-tools
+Requires(postun): javapackages-tools
+Requires: hamcrest
+Requires: java >= 1.6.0
+Provides: junit4 = %{version}
+Obsoletes: junit4 <= 4.10
+%description
+JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
+It is used by the developer who implements unit tests in Java. JUnit is Open
+Source Software, released under the Common Public License Version 1.0 and
+hosted on GitHub.
%package manual
-Summary: Manual for junit
-Group: Development/Libraries/Java
+Summary: Manual for %{name}
+Group: Documentation/Other
+Provides: junit4-manual = %{version}
+Obsoletes: junit4-manual <= 4.10
%description manual
-JUnit is a regression testing framework written by Erich Gamma and Kent
-Beck. It is used by the developer who implements unit tests in Java.
-JUnit is Open Source Software, released under the IBM Public License
-and hosted on SourceForge.
+Manual for %{name}.
-This package contains the manual for JUnit.
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation/HTML
+Provides: junit4-javadoc = %{version}
+Obsoletes: junit4-javadoc <= 4.10
+
+%description javadoc
+Javadoc for %{name}.
%package demo
-Summary: Demonstration and sample files for junit
-Group: Development/Libraries/Java
-Requires: %{name} = %{version}-%{release}
+Summary: Demos for %{name}
+Group: Documentation/Other
+Requires: %{name} = %{version}
+Provides: junit4-demo = %{version}
+Obsoletes: junit4-demo <= 4.10
%description demo
-JUnit is a regression testing framework written by Erich Gamma and Kent
-Beck. It is used by the developer who implements unit tests in Java.
-JUnit is Open Source Software, released under the IBM Public License
-and hosted on SourceForge.
-
-This package contains demonstration and sample files for JUnit.
+Demos for %{name}.
+%prep
+%setup -q -n junit-r%{version}
+%patch0 -p1
+find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf
-%prep
-%setup -q -n %{name}%{version}
-# extract sources
-jar xvf src.jar
-# % patch
-cp %{SOURCE1} build.xml
+ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
%build
-ant dist
+#export CLASSPATH=
+#export OPT_JAR_LIST=:
+#ant -Dant.build.javac.source=1.5 dist
+ant dist -Dversion-status=
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{name}%{version}/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
-# demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr %{name}%{version}/%{name}/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 junit%{version}/junit-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# compat symlink
+ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/junit4.jar
+
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
+
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
+# demo
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is
+ # part of package name
+cp -pr junit%{version}/junit/* %{buildroot}%{_datadir}/%{name}/demo/junit
+
+%check
+
+cat > test.java <