Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at 2019-02-02 21:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4j (Old) and /work/SRC/openSUSE:Factory/.log4j.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "log4j" Sat Feb 2 21:44:47 2019 rev:24 rq:668996 version:1.2.17 Changes: -------- --- /work/SRC/openSUSE:Factory/log4j/log4j-mini.changes 2018-08-07 09:39:49.612970186 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new.28833/log4j-mini.changes 2019-02-02 21:44:48.640211502 +0100 @@ -1,0 +2,23 @@ +Tue Jan 22 10:59:09 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against a generic javamail provider instead of against + classpathx-mail + +------------------------------------------------------------------- +Tue Jan 15 04:41:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Let log4j provide the log4j-mini and obsolete it too. +- Remove conflicts on each other + +------------------------------------------------------------------- +Thu Dec 13 15:36:59 UTC 2018 - Fridrich Strba <[email protected]> + +- Depend on the generic xml-apis + +------------------------------------------------------------------- +Thu Oct 18 11:50:32 UTC 2018 - Fridrich Strba <[email protected]> + +- Install and package the maven pom and metadata files for the + non-bootstrap log4j + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/log4j/log4j.changes 2018-11-06 14:16:43.966475707 +0100 +++ /work/SRC/openSUSE:Factory/.log4j.new.28833/log4j.changes 2019-02-02 21:44:48.680211468 +0100 @@ -1,0 +2,17 @@ +Tue Jan 22 10:59:09 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against a generic javamail provider instead of against + classpathx-mail + +------------------------------------------------------------------- +Tue Jan 15 04:41:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Let log4j provide the log4j-mini and obsolete it too. +- Remove conflicts on each other + +------------------------------------------------------------------- +Thu Dec 13 15:36:59 UTC 2018 - Fridrich Strba <[email protected]> + +- Depend on the generic xml-apis + +------------------------------------------------------------------- @@ -4 +21,2 @@ -- Install and package the maven pom and metadata files +- Install and package the maven pom and metadata files for the + non-bootstrap log4j ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j-mini.spec ++++++ --- /var/tmp/diff_new_pack.ThLsMF/_old 2019-02-02 21:44:49.468210785 +0100 +++ /var/tmp/diff_new_pack.ThLsMF/_new 2019-02-02 21:44:49.472210782 +0100 @@ -1,7 +1,7 @@ # # spec file for package log4j-mini # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Summary: Java logging tool License: Apache-2.0 Group: Development/Libraries/Java -Url: http://logging.apache.org/log4j/ +URL: http://logging.apache.org/log4j/ Source0: http://www.apache.org/dist/logging/log4j/%{version}/log4j-%{version}.tar.gz # Converted from src/java/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif Source1: %{real}-logfactor5.png @@ -46,32 +46,30 @@ # PATCH-FIX-OPENSUSE -- Drop javadoc timestamp Patch3: %{real}-reproducible.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jndi BuildRequires: perl BuildRequires: update-desktop-files Requires: javapackages-tools Requires: jaxp_parser_impl -Requires: xml-commons-apis +Requires: xml-apis Requires(pre): coreutils BuildArch: noarch %if %{bootstrap} Provides: %{real} = %{version}-%{release} -%endif -%if ! %{bootstrap} -BuildRequires: classpathx-mail +%else BuildRequires: geronimo-jaf-1_0_2-api BuildRequires: geronimo-jms-1_1-api +BuildRequires: javamail BuildRequires: mx4j #!BuildIgnore: apache-commons-discovery #!BuildIgnore: apache-commons-logging #!BuildIgnore: axis -%endif -%if %{bootstrap} -Conflicts: log4j -%else -Conflicts: log4j-mini +Provides: log4j-mini +Obsoletes: log4j-mini %endif %description @@ -134,10 +132,17 @@ mkdir -p %{buildroot}%{_javadir} cp -a dist/lib/log4j-%{version}.jar %{buildroot}%{_javadir} (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %if ! %{bootstrap} +#pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar + # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} rm -rf docs/api ln -s %{_javadocdir}/%{name} docs/api %endif @@ -197,15 +202,21 @@ fi %files -%doc LICENSE +%license LICENSE %doc NOTICE %{_bindir}/* %{_javadir}/* %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/sgml/%{name} - %if ! %{bootstrap} +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif + %files manual %doc docs/* contribs ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.ThLsMF/_old 2019-02-02 21:44:49.496210761 +0100 +++ /var/tmp/diff_new_pack.ThLsMF/_new 2019-02-02 21:44:49.500210757 +0100 @@ -1,7 +1,7 @@ # # spec file for package log4j # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Summary: Java logging tool License: Apache-2.0 Group: Development/Libraries/Java -Url: http://logging.apache.org/log4j/ +URL: http://logging.apache.org/log4j/ Source0: http://www.apache.org/dist/logging/log4j/%{version}/log4j-%{version}.tar.gz # Converted from src/java/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif Source1: %{real}-logfactor5.png @@ -45,6 +45,7 @@ # PATCH-FIX-OPENSUSE -- Drop javadoc timestamp Patch3: %{real}-reproducible.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -53,25 +54,21 @@ BuildRequires: update-desktop-files Requires: javapackages-tools Requires: jaxp_parser_impl -Requires: xml-commons-apis +Requires: xml-apis Requires(pre): coreutils BuildArch: noarch %if %{bootstrap} Provides: %{real} = %{version}-%{release} -%endif -%if ! %{bootstrap} -BuildRequires: classpathx-mail +%else BuildRequires: geronimo-jaf-1_0_2-api BuildRequires: geronimo-jms-1_1-api +BuildRequires: javamail BuildRequires: mx4j #!BuildIgnore: apache-commons-discovery #!BuildIgnore: apache-commons-logging #!BuildIgnore: axis -%endif -%if %{bootstrap} -Conflicts: log4j -%else -Conflicts: log4j-mini +Provides: log4j-mini +Obsoletes: log4j-mini %endif %description @@ -144,6 +141,7 @@ # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} rm -rf docs/api ln -s %{_javadocdir}/%{name} docs/api %endif @@ -203,7 +201,7 @@ fi %files -%doc LICENSE +%license LICENSE %doc NOTICE %{_bindir}/* %{_javadir}/*
