Hello community, here is the log from the commit of package avalon-logkit for openSUSE:Factory checked in at 2014-06-30 22:49:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avalon-logkit (Old) and /work/SRC/openSUSE:Factory/.avalon-logkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avalon-logkit" Changes: -------- --- /work/SRC/openSUSE:Factory/avalon-logkit/avalon-logkit.changes 2013-09-11 13:39:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.avalon-logkit.new/avalon-logkit.changes 2014-06-30 22:49:42.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 27 13:01:59 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner +- Build on SLE11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avalon-logkit.spec ++++++ --- /var/tmp/diff_new_pack.U26svQ/_old 2014-06-30 22:49:43.000000000 +0200 +++ /var/tmp/diff_new_pack.U26svQ/_new 2014-06-30 22:49:43.000000000 +0200 @@ -1,9 +1,8 @@ # # spec file for package avalon-logkit # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2005, JPackage Project -# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +20,6 @@ # %define short_name logkit %define camelcase_short_name LogKit - Name: avalon-logkit Version: 2.1 Release: 0 @@ -37,12 +35,6 @@ Patch1: avalon-logkit-pom-deps.patch Patch2: avalon-logkit-encoding.patch Patch3: fix-java7-compile.patch - -Requires: avalon-framework >= 4.1.4 -#Requires: jdbc-stdext -Requires: jms -Requires: servlet30 - BuildRequires: ant BuildRequires: ant-junit BuildRequires: avalon-framework >= 4.1.4 @@ -53,9 +45,12 @@ BuildRequires: log4j BuildRequires: servlet30 BuildRequires: unzip - -BuildArch: noarch +Requires: avalon-framework >= 4.1.4 +#Requires: jdbc-stdext +Requires: jms +Requires: servlet30 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description LogKit is a logging toolkit designed for secure performance orientated @@ -92,24 +87,25 @@ junit \ ):$PWD/build/classes -ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \ - -lib /usr/share/java +ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ + -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \ + -lib %{_datadir}/java # Convert to OSGi bundle #java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar #pom -install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} -install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom +install -d -m 755 %{buildroot}/%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}" # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
