From be12b014c30a99620b8972e24dfd5200766277b94827115f2d24035fe9bfa9a2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 4 Feb 2019 17:16:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=27 --- build.xml | 35 ++++++++++++++++++++++++----- junit.changes | 6 +++++ junit.spec | 62 +++++++++++++++++++++++++++------------------------ 3 files changed, 69 insertions(+), 34 deletions(-) diff --git a/build.xml b/build.xml index 8f79e01..cf4911c 100644 --- a/build.xml +++ b/build.xml @@ -8,6 +8,7 @@ + @@ -34,6 +35,9 @@ + + + @@ -72,8 +76,8 @@ debug="on" classpath="@{classpath}" includeantruntime="false" - source="1.6" - target="1.6" + source="${compiler.source}" + target="${compiler.target}" > @@ -96,8 +100,29 @@ + excludes="${unjarred}, **/*.java, build.xml"> + + + + + + + + + + + + + + + + + + + + + + + +- Add OSGi manifest to the jar file +- Package the manual + ------------------------------------------------------------------- Mon Jan 21 23:36:15 UTC 2019 - Jan Engelhardt diff --git a/junit.spec b/junit.spec index 02e1008..634a081 100644 --- a/junit.spec +++ b/junit.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Java regression test package License: CPL-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 @@ -37,8 +37,12 @@ Requires: hamcrest Requires: java >= 1.6 Requires(post): javapackages-tools Requires(postun): javapackages-tools -Provides: junit4 = %{version} -Obsoletes: junit4 <= 4.10 +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 +52,23 @@ It is used by the developer who implements unit tests in Java. %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 +84,18 @@ ant jars javadoc -Dversion-status= %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 +114,17 @@ javac -cp %{buildroot}/%{_javadir}/%{name}.jar test.java 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