Hello community, here is the log from the commit of package xmlunit for openSUSE:Factory checked in at 2013-09-12 13:26:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlunit (Old) and /work/SRC/openSUSE:Factory/.xmlunit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlunit" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlunit/xmlunit.changes 2011-12-21 17:01:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xmlunit.new/xmlunit.changes 2013-09-12 13:26:50.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Sep 11 10:03:55 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Mon Sep 9 11:06:30 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlunit.spec ++++++ --- /var/tmp/diff_new_pack.SM3LRo/_old 2013-09-12 13:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.SM3LRo/_new 2013-09-12 13:26:50.000000000 +0200 @@ -1,7 +1,7 @@ # # 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 # All rights reserved. # @@ -18,8 +18,6 @@ # -%define section free - Name: xmlunit Version: 1.0 Release: 0 @@ -35,21 +33,20 @@ BuildRequires: ant-junit BuildRequires: ant-trax BuildRequires: java-devel -BuildRequires: jpackage-utils +BuildRequires: javapackages-tools +BuildRequires: junit +BuildRequires: unzip BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-jaxp-1.3-apis -%if %defined suse_version -BuildRequires: unzip -%endif Requires: junit Requires: xalan-j2 -Requires: xml-commons-jaxp-1.3-apis Requires: xerces-j2 +Requires: xml-commons-jaxp-1.3-apis BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): jpackage-utils >= 1.7.3 -Requires(postun): jpackage-utils >= 1.7.3 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools %description XMLUnit extends JUnit to simplify unit testing of XML. It compares a control @@ -84,48 +81,31 @@ %build export CLASSPATH= 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 -rm -rf $RPM_BUILD_ROOT - mkdir -p $RPM_BUILD_ROOT%{_javadir} -install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.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) +install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # poms -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms - +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap # Javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) %doc README.txt LICENSE.txt XMLUnit.pdf example.html %{_javadir}/* -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
