Hello community, here is the log from the commit of package avalon-logkit for openSUSE:Factory checked in at 2017-09-17 22:37:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avalon-logkit (Old) and /work/SRC/openSUSE:Factory/.avalon-logkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avalon-logkit" Sun Sep 17 22:37:10 2017 rev:13 rq:526401 version:2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/avalon-logkit/avalon-logkit.changes 2017-05-22 10:49:15.553897080 +0200 +++ /work/SRC/openSUSE:Factory/.avalon-logkit.new/avalon-logkit.changes 2017-09-17 22:37:18.309289693 +0200 @@ -1,0 +2,12 @@ +Fri Sep 15 16:14:15 UTC 2017 - [email protected] + +- RPM group and minor spelling fix. Replacement of + -exec rm by -delete. + +------------------------------------------------------------------- +Fri Sep 15 09:20:19 UTC 2017 - [email protected] + +- Fix build with jdk9 by specifying java source and target 1.6 +- Clean spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avalon-logkit.spec ++++++ --- /var/tmp/diff_new_pack.HZUTvD/_old 2017-09-17 22:37:19.537117064 +0200 +++ /var/tmp/diff_new_pack.HZUTvD/_new 2017-09-17 22:37:19.545115940 +0200 @@ -36,7 +36,8 @@ Patch3: fix-java7-compile.patch BuildRequires: ant BuildRequires: ant-junit -BuildRequires: avalon-framework >= 4.1.4 +BuildRequires: fdupes +BuildRequires: java-devel >= 1.6 BuildRequires: javamail BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -45,19 +46,18 @@ BuildRequires: log4j BuildRequires: servlet >= 3.0 BuildRequires: unzip -Requires: avalon-framework >= 4.1.4 Requires: jms Requires: servlet >= 3.0 BuildArch: noarch %description -LogKit is a logging toolkit designed for secure performance orientated +LogKit is a logging toolkit designed for secure performance oriented logging in applications. To get started using LogKit, it is recomended that you read the whitepaper and browse the API docs. %package javadoc Summary: Javadoc for %{name} -Group: Development/Libraries/Java +Group: Documentation/HTML %description javadoc API documentation for %{name}. @@ -71,22 +71,21 @@ %patch3 # remove all binary libs -find . -name "*.jar" -exec rm -f {} \; +find . -name "*.jar" -delete %build -export CLASSPATH=%(build-classpath \ +ant clean +mkdir -p target/lib +build-jar-repository -s -p target/lib \ log4j \ javamail/mailapi \ jms_api \ tomcat-servlet-api \ - jdbc-stdext \ - avalon-framework \ junit \ - ):$PWD/build/classes -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 +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dencoding=ISO-8859-1 -Dnoget=true -lib %{_datadir}/java \ + jar javadoc %install # jars @@ -101,16 +100,15 @@ # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes %{buildroot}%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) %doc LICENSE.txt NOTICE.txt %{_javadir}/* %{_datadir}/maven-metadata/%{name}.xml %{_mavenpomdir}/JPP-%{name}.pom %files javadoc -%defattr(0644,root,root,0755) %doc LICENSE.txt %{_javadocdir}/*
