Hello community, here is the log from the commit of package junit for openSUSE:Factory checked in at 2019-02-06 15:46:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/junit (Old) and /work/SRC/openSUSE:Factory/.junit.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "junit" Wed Feb 6 15:46:48 2019 rev:24 rq:671538 version:4.12 Changes: -------- --- /work/SRC/openSUSE:Factory/junit/junit.changes 2019-02-04 21:23:17.799626760 +0100 +++ /work/SRC/openSUSE:Factory/.junit.new.28833/junit.changes 2019-02-06 15:46:49.571280702 +0100 @@ -1,0 +2,8 @@ +Mon Feb 4 17:16:22 UTC 2019 - Fridrich Strba <[email protected]> + +- Add OSGi manifest to the jar file +- Package the manual +- BuildRequire and Require hamcrest-core, since the package does + strictly depend on hamcrest-core only. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ junit.spec ++++++ --- /var/tmp/diff_new_pack.2mFgBN/_old 2019-02-06 15:46:50.195280323 +0100 +++ /var/tmp/diff_new_pack.2mFgBN/_new 2019-02-06 15:46:50.195280323 +0100 @@ -20,25 +20,25 @@ Version: 4.12 Release: 0 Summary: Java regression test package -License: CPL-1.0 +License: EPL-1.0 Group: Development/Libraries/Java -Url: http://www.junit.org/ +URL: http://www.junit.org/ Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz Source1: build.xml Patch0: junit-jdk10.patch Patch1: junit-jdk11.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: hamcrest >= 1.3 -BuildRequires: java-devel >= 1.6.0 +BuildRequires: hamcrest-core >= 1.3 +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local -BuildRequires: perl(Digest::MD5) -Requires: hamcrest -Requires: java >= 1.6 -Requires(post): javapackages-tools -Requires(postun): javapackages-tools -Provides: junit4 = %{version} -Obsoletes: junit4 <= 4.10 +Requires: mvn(org.hamcrest:hamcrest-core) +Provides: %{name}-demo = %{version}-%{release} +Obsoletes: %{name}-demo < %{version}-%{release} +Provides: %{name}4-demo = %{version}-%{release} +Obsoletes: %{name}4-demo < %{version}-%{release} +Provides: %{name}4 = %{version}-%{release} +Obsoletes: %{name}4 < %{version}-%{release} BuildArch: noarch %description @@ -48,22 +48,23 @@ %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML -Provides: junit4-javadoc = %{version} -Obsoletes: junit4-javadoc <= 4.10 -Provides: junit4-manual = %{version} -Obsoletes: junit4-manual <= 4.10 -Provides: junit4-demo = %{version} -Obsoletes: junit4-demo <= 4.10 -Provides: %{name}-manual = %{version} -Obsoletes: %{name}-manual < %{version} -Provides: %{name}-demo = %{version} -Obsoletes: %{name}-demo < %{version} +Provides: %{name}4-javadoc = %{version}-%{release} +Obsoletes: %{name}4-javadoc < %{version}-%{release} %description javadoc Javadoc for %{name}. +%package manual +Summary: Manual for %{name} +Group: Documentation/Other +Provides: %{name}4-manual = %{version}-%{release} +Obsoletes: %{name}4-manual < %{version}-%{release} + +%description manual +Documentation for %{name}. + %prep -%setup -q -n junit4-r%{version} +%setup -q -n %{name}4-r%{version} cp %{SOURCE1} . %patch0 -p1 %patch1 -p1 @@ -79,18 +80,18 @@ %install # jars install -d -m 755 %{buildroot}%{_javadir} -install -m 644 junit%{version}/junit-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # compat symlink -ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/junit4.jar +ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} +cp -pr %{name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} %check @@ -109,18 +110,17 @@ java -cp %{buildroot}/%{_javadir}/%{name}.jar: test 2>&1 | \ grep 'Exception in thread "main" java.lang.AssertionError: Hello world from junit' -%files -%doc CODING_STYLE.txt LICENSE-junit.txt README.md acknowledgements.txt -%{_javadir}/%{name}.jar -%{_javadir}/junit4.jar -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif +%files -f .mfiles +%license LICENSE-junit.txt +%doc CODING_STYLE.txt README.md acknowledgements.txt +%{_javadir}/%{name}4.jar %files javadoc +%license LICENSE-junit.txt %{_javadocdir}/%{name} +%files manual +%license LICENSE-junit.txt +%doc doc/* + %changelog ++++++ build.xml ++++++ --- /var/tmp/diff_new_pack.2mFgBN/_old 2019-02-06 15:46:50.223280306 +0100 +++ /var/tmp/diff_new_pack.2mFgBN/_new 2019-02-06 15:46:50.227280304 +0100 @@ -8,6 +8,7 @@ <property name="target" location="target" /> <property name="bin" location="${target}/main" /> <property name="version-base" value="4.12" /> + <property name="version-bundle" value="${version-base}.0" /> <property name="version-status" value="-SNAPSHOT" /> <property name="version" value="${version-base}${version-status}" /> <property name="dist" value="junit${version}" /> @@ -34,6 +35,9 @@ <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" /> <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" /> + + <property name="compiler.source" value="1.6" /> + <property name="compiler.target" value="${compiler.source}" /> <target name="init"> <tstamp/> @@ -72,8 +76,8 @@ debug="on" classpath="@{classpath}" includeantruntime="false" - source="1.6" - target="1.6" + source="${compiler.source}" + target="${compiler.target}" > <compilerarg value="-Xlint:unchecked" /> </javac> @@ -96,8 +100,29 @@ <jar jarfile="${dist}/${binjar}" basedir="${bin}" - excludes="${unjarred}, **/*.java, build.xml" - /> + excludes="${unjarred}, **/*.java, build.xml"> + <manifest> + <attribute name="Bundle-Description" value="JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck."/> + <attribute name="Bundle-DocURL" value="http://www.junit.org"/> + <attribute name="Bundle-License" value="http://www.eclipse.org/legal/epl-v10.html"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="JUnit"/> + <attribute name="Bundle-SymbolicName" value="org.junit"/> + <attribute name="Bundle-Vendor" value="JUnit"/> + <attribute name="Bundle-Version" value="${version-bundle}"/> + <attribute name="Export-Package" value="org.junit;version="${version-bundle}",org.junit.experimental.max;version="${version-bundle}",org.junit.experimental;version="${version-bundle}",org.junit.experimental.runners;version="${version-bundle}",org.junit.experimental.categories;version="${version-bundle}",org.junit.experimental.theories;version="${version-bundle}",org.junit.experimental.theories.suppliers;version="${version-bundle}",org.junit.experimental.results;version="${version-bundle}",org.junit.runners;version="${version-bundle}",org.junit.runners.model;version="${version-bundle}",org.junit.runners.parameterized;version="${version-bundle}",org.junit.matchers;version="${version-bundle}",org.junit.runner;version="${version-bundle}",org.junit.runner.manipulation;version="${version-bundle}",org.junit.runner.notification;version="${version-bundle}",org.junit.rules;version="${version-bundle}",org.junit.validator;version="${version-bundle}",junit.framework;version="${version-bundle}",junit.runner;version="${version-bundle}",junit.extensions;version="${version-bundle}",junit.textui;version="${version-bundle}",org.junit.experimental.theories.internal;x-internal:=true;version="${version-bundle}",org.junit.internal;x-internal:=true;version="${version-bundle}",org.junit.internal.builders;x-internal:=true;version="${version-bundle}",org.junit.internal.matchers;x-internal:=true;version="${version-bundle}",org.junit.internal.requests;x-internal:=true;version="${version-bundle}",org.junit.internal.runners;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.model;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.rules;x-internal:=true;version="${version-bundle}",org.junit.internal.runners.statements;x-internal:=true;version="${version-bundle}""/> + <attribute name="Implementation-Title" value="JUnit"/> + <attribute name="Implementation-URL" value="http://junit.org"/> + <attribute name="Implementation-Vendor" value="JUnit"/> + <attribute name="Implementation-Vendor-Id" value="junit"/> + <attribute name="Implementation-Version" value="${version-base}"/> + <attribute name="Import-Package" value="junit.extensions,junit.framework,junit.runner,org.hamcrest;version="[1.3,2)";core=split,org.hamcrest.core;version="[1.3,2)",org.junit,org.junit.experimental.theories,org.junit.experimental.theories.internal,org.junit.internal,org.junit.internal.builders,org.junit.internal.matchers,org.junit.internal.requests,org.junit.internal.runners,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.internal.runners.statements,org.junit.matchers,org.junit.rules,org.junit.runner,org.junit.runner.manipulation,org.junit.runner.notification,org.junit.runners,org.junit.runners.model,org.junit.runners.parameterized,org.junit.validator"/> + <attribute name="JavaPackages-ArtifactId" value="junit"/> + <attribute name="JavaPackages-GroupId" value="junit"/> + <attribute name="JavaPackages-Version" value="${version-base}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + </manifest> + </jar> <jar jarfile="${dist}/${depjar}" basedir="${bin}" @@ -129,7 +154,7 @@ <target name="javadoc"> <javadoc destdir="${javadocdir}" - source="1.6" + source="${compiler.source}" author="false" version="false" use="false"
