Accepting request 198463 from Java:packages

- use add_maven_depmap from javapackages-tools

- Move from jpackage-utils to javapackage-tools

OBS-URL: https://build.opensuse.org/request/show/198463
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlunit?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal 2013-09-12 11:26:49 +00:00 committed by Git OBS Bridge
commit d73b4180a4
2 changed files with 25 additions and 35 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 11 10:03:55 UTC 2013 - mvyskocil@suse.com
- use add_maven_depmap from javapackages-tools
-------------------------------------------------------------------
Mon Sep 9 11:06:30 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 15 11:29:10 UTC 2011 - mvyskocil@suse.cz Thu Dec 15 11:29:10 UTC 2011 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package xmlunit # spec file for package xmlunit
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2008, JPackage Project # Copyright (c) 2000-2008, JPackage Project
# All rights reserved. # All rights reserved.
# #
@ -18,8 +18,6 @@
# #
%define section free
Name: xmlunit Name: xmlunit
Version: 1.0 Version: 1.0
Release: 0 Release: 0
@ -35,21 +33,20 @@ BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: ant-trax BuildRequires: ant-trax
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: jpackage-utils BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: unzip
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: xerces-j2 BuildRequires: xerces-j2
BuildRequires: xml-commons-jaxp-1.3-apis BuildRequires: xml-commons-jaxp-1.3-apis
%if %defined suse_version
BuildRequires: unzip
%endif
Requires: junit Requires: junit
Requires: xalan-j2 Requires: xalan-j2
Requires: xml-commons-jaxp-1.3-apis
Requires: xerces-j2 Requires: xerces-j2
Requires: xml-commons-jaxp-1.3-apis
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): jpackage-utils >= 1.7.3 Requires(post): javapackages-tools
Requires(postun): jpackage-utils >= 1.7.3 Requires(postun): javapackages-tools
%description %description
XMLUnit extends JUnit to simplify unit testing of XML. It compares a control XMLUnit extends JUnit to simplify unit testing of XML. It compares a control
@ -84,48 +81,31 @@ EOF
%build %build
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 -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar test docs ant jar test docs
%install %install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p $RPM_BUILD_ROOT%{_javadir}
install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
# Jar versioning
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# poms # poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -m 644 %{SOURCE1} \ install -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# Javadoc # Javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc README.txt LICENSE.txt XMLUnit.pdf example.html %doc README.txt LICENSE.txt XMLUnit.pdf example.html
%{_javadir}/* %{_javadir}/*
%{_datadir}/maven2/poms/* %{_mavenpomdir}/*
%{_mavendepmapfragdir}/* %{_mavendepmapfragdir}/*
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog