Hello community, here is the log from the commit of package xml-im-exporter for openSUSE:Factory checked in at 2013-09-12 13:26:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xml-im-exporter (Old) and /work/SRC/openSUSE:Factory/.xml-im-exporter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xml-im-exporter" Changes: -------- --- /work/SRC/openSUSE:Factory/xml-im-exporter/xml-im-exporter.changes 2011-09-23 12:51:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xml-im-exporter.new/xml-im-exporter.changes 2013-09-12 13:26:45.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 11 09:23:46 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools +- fix a build with java7 + * encoding.patch + +------------------------------------------------------------------- +Mon Sep 9 11:06:30 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- New: ---- encoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-im-exporter.spec ++++++ --- /var/tmp/diff_new_pack.uhUMt3/_old 2013-09-12 13:26:45.000000000 +0200 +++ /var/tmp/diff_new_pack.uhUMt3/_new 2013-09-12 13:26:45.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xml-im-exporter (Version 1.1) +# spec file for package xml-im-exporter # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,20 @@ # -%define section free - Name: xml-im-exporter Version: 1.1 -Release: 2 +Release: 0 Summary: XML Im-/Exporter License: LGPL-2.0+ -Url: http://xml-im-exporter.sourceforge.net/ Group: Development/Libraries/Java +Url: http://xml-im-exporter.sourceforge.net/ Source0: xml-im-exporter1.1.tar.bz2 Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/de/zeigermann/xml/xml-im-exporter/1.1/xml-im-exporter-1.1.pom Patch0: xml-im-exporter-build_xml.patch -BuildRequires: jpackage-utils >= 1.6 +Patch1: encoding.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit +BuildRequires: javapackages-tools BuildRequires: junit BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +43,6 @@ %package javadoc -License: LGPL-2.0+ Summary: XML Im-/Exporter Group: Development/Libraries/Java @@ -66,41 +64,37 @@ # wrong end of line encoding sed -i -e 's/.$//' *.txt doc/javadoc/stylesheet.css doc/javadoc/package-list %patch0 -b .sav +%patch1 -p1 %build export CLASSPATH= export OPT_JAT_LIST="junit ant/ant-junit" -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar test javadocs +ant -Djavac.encoding="utf-8" jar test javadocs %install # jars install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -m 644 build/lib/%{name}%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -# maven -%add_to_maven_depmap de.zeigermann.xml %{name} %{version} JPP %{name} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%clean -rm -rf $RPM_BUILD_ROOT +# maven +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}/ +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files %defattr(0644,root,root,0755) %doc doc/index.html *.txt %{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %config %{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %changelog ++++++ encoding.patch ++++++ From: [email protected] Subject: Specify encoding of source files java7 does expect only ascii by default --- build.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: xml-im-exporter/build.xml =================================================================== --- xml-im-exporter.orig/build.xml +++ xml-im-exporter/build.xml @@ -72,7 +72,8 @@ <javac destdir="${build.classes}" debug="${debug}" deprecation="${deprecation}" - optimize="${optimize}" > + optimize="${optimize}" + encoding="ISO-8859-1" > <src path="${src.dir}/main"/> <src path="${src.dir}/test"/> <classpath refid="classpath" /> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
