pool/xmlunit
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 527224 from Java:packages

Browse Source 
Fix build with jdk9

OBS-URL: https://build.opensuse.org/request/show/527224
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlunit?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2017-09-20 15:10:15 +00:00 committed by Git OBS Bridge
commit 65c85e7149
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xmlunit.changes
View File

@ -1,7 +1,14 @@
-------------------------------------------------------------------
Tue Sep 19 07:20:04 UTC 2017 - fstrba@suse.com
- Specify java source and target level 1.6 in order to allow build
with jdk9
- Clean spec file and fix duplicate waste rpmlint error
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 09:21:06 UTC 2017 - vsistek@suse.com Fri May 19 09:21:06 UTC 2017 - vsistek@suse.com
- Add BuildRequires: javapackages-local (for maven conversions) - Add BuildRequires: javapackages-local (for maven conversions)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 18 09:40:00 UTC 2015 - tchvatal@suse.com Wed Mar 18 09:40:00 UTC 2015 - tchvatal@suse.com

6
xmlunit.spec
View File

@ -28,6 +28,7 @@ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.z
Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom Source1: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: fdupes
# Needed for maven conversions # Needed for maven conversions
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
@ -77,7 +78,7 @@ EOF
export CLASSPATH= export CLASSPATH=
export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer" export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
ant -Dbuild.compiler=modern -Dhaltonfailure=yes jar javadocs ant -Djavac.source=1.6 -Djavac.target=1.6 -Dbuild.compiler=modern -Dhaltonfailure=yes jar javadocs
%install %install
mkdir -p %{buildroot}%{_javadir} mkdir -p %{buildroot}%{_javadir}
@ -86,6 +87,7 @@ install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
# Javadoc # Javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name} mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name} cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# poms # poms
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
@ -94,14 +96,12 @@ install -m 644 build/lib/%{name}-%{version}.pom \
%add_maven_depmap %add_maven_depmap
%files %files
%defattr(0644,root,root,0755)
%doc README.txt LICENSE.txt %doc README.txt LICENSE.txt
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_mavenpomdir}/JPP-%{name}.pom %{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/maven-metadata/%{name}.xml %{_datadir}/maven-metadata/%{name}.xml
%files javadoc %files javadoc
%defattr(0644,root,root,0755)
%doc userguide %doc userguide
%{_javadocdir}/%{name} %{_javadocdir}/%{name}