This commit is contained in:
parent
d4b0000a33
commit
a4d33b9f0c
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 18 15:40:52 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Run fdupes on documentation
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 18 15:35:28 UTC 2017 - dimstar@opensuse.org
|
Mon Dec 18 15:35:28 UTC 2017 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ Patch1: junit-jdk8.patch
|
|||||||
Patch2: junit-jdk9.patch
|
Patch2: junit-jdk9.patch
|
||||||
Patch3: junit-jdk10.patch
|
Patch3: junit-jdk10.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
|
BuildRequires: fdupes
|
||||||
BuildRequires: hamcrest >= 1.3
|
BuildRequires: hamcrest >= 1.3
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
@ -44,7 +45,6 @@ Requires(post): javapackages-tools
|
|||||||
Requires(postun): javapackages-tools
|
Requires(postun): javapackages-tools
|
||||||
Provides: junit4 = %{version}
|
Provides: junit4 = %{version}
|
||||||
Obsoletes: junit4 <= 4.10
|
Obsoletes: junit4 <= 4.10
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -111,6 +111,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
# demo
|
# demo
|
||||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is
|
install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is
|
||||||
@ -134,7 +135,6 @@ java -cp %{buildroot}/%{_javadir}/%{name}.jar: test 2>&1 | \
|
|||||||
grep 'Exception in thread "main" java.lang.AssertionError: Hello world from junit'
|
grep 'Exception in thread "main" java.lang.AssertionError: Hello world from junit'
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc CODING_STYLE LICENSE README acknowledgements.txt
|
%doc CODING_STYLE LICENSE README acknowledgements.txt
|
||||||
%{_javadir}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/junit4.jar
|
%{_javadir}/junit4.jar
|
||||||
@ -142,15 +142,12 @@ java -cp %{buildroot}/%{_javadir}/%{name}.jar: test 2>&1 | \
|
|||||||
%{_datadir}/maven-metadata/%{name}.xml*
|
%{_datadir}/maven-metadata/%{name}.xml*
|
||||||
|
|
||||||
%files demo
|
%files demo
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%files manual
|
%files manual
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc junit%{version}/doc/*
|
%doc junit%{version}/doc/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user