Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at 2013-09-12 13:27:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/log4j (Old) and /work/SRC/openSUSE:Factory/.log4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "log4j" Changes: -------- --- /work/SRC/openSUSE:Factory/log4j/log4j-mini.changes 2011-09-23 02:11:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new/log4j-mini.changes 2013-09-12 13:27:40.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Sep 12 08:44:08 UTC 2013 - [email protected] + +- log4j and log4j-mini are in conflict + +------------------------------------------------------------------- +Mon Sep 9 11:32:17 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Tue Jul 16 14:05:53 CEST 2013 - [email protected] + +- get rid of wrong dir modifier in filelist + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/log4j/log4j.changes 2011-09-23 02:11:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new/log4j.changes 2013-09-12 13:27:40.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Sep 12 08:44:08 UTC 2013 - [email protected] + +- log4j and log4j-mini are in conflict + +------------------------------------------------------------------- +Mon Sep 9 11:06:12 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Tue Jul 16 14:05:53 CEST 2013 - [email protected] + +- get rid of wrong dir modifier in filelist + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j-mini.spec ++++++ --- /var/tmp/diff_new_pack.7SJs57/_old 2013-09-12 13:27:41.000000000 +0200 +++ /var/tmp/diff_new_pack.7SJs57/_new 2013-09-12 13:27:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package log4j-mini (Version 1.2.15) +# spec file for package log4j-mini # -# 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 @@ -26,9 +26,10 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) Version: 1.2.15 -Release: 76 +Release: 0 Summary: Java logging tool (internal featureless package breaking dependency loop) License: Apache-2.0 +Group: Development/Libraries/Java Url: http://logging.apache.org/log4j/ Source0: http://www.apache.org/dist/logging/log4j/%{version}/apache-log4j-%{version}.tar.bz2 #Source0: logging-log4j-1.2.13-RHCLEAN.tar.gz @@ -46,28 +47,27 @@ Patch1: %{real}-javadoc-xlink.patch Patch2: %{real}-mx4j-tools.patch Patch3: %{real}-jmx-Agent.patch -BuildRequires: jpackage-utils >= 1.6 BuildRequires: ant +BuildRequires: javapackages-tools %if ! %{bootstrap} -BuildRequires: geronimo-jaf-1_0_2-api BuildRequires: classpathx-mail +BuildRequires: geronimo-jaf-1_0_2-api BuildRequires: geronimo-jms-1_1-api BuildRequires: mx4j %endif BuildRequires: jndi %if %defined suse_version -BuildRequires: perl BuildRequires: java-devel +BuildRequires: perl BuildRequires: update-desktop-files PreReq: coreutils %else BuildRequires: %{__perl} BuildRequires: java-javadoc %endif -Requires: jpackage-utils >= 1.6 -Requires: xml-commons-apis +Requires: javapackages-tools Requires: jaxp_parser_impl -Group: Development/Libraries/Java +Requires: xml-commons-apis %if ! %{gcj_support} BuildArch: noarch %endif @@ -80,6 +80,11 @@ Requires(postun): java-gcj-compat %endif +%if %{bootstrap} +Conflicts: log4j +%else +Conflicts: log4j-mini +%endif %description Log4j is a tool to help the programmer output log statements to a variety of output targets. @@ -89,7 +94,6 @@ %if ! %{bootstrap} %package manual -License: Apache-2.0 Summary: Java logging tool (internal featureless package breaking dependency loop) Group: Development/Libraries/Java @@ -100,7 +104,6 @@ %package javadoc -License: Apache-2.0 PreReq: coreutils Summary: Java logging tool (Documentation) Group: Development/Libraries/Java @@ -268,7 +271,7 @@ %defattr(0644,root,root,0755) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}/* -%ghost %dir %{_javadocdir}/%{name} +%ghost %{_javadocdir}/%{name} %endif %changelog ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.7SJs57/_old 2013-09-12 13:27:41.000000000 +0200 +++ /var/tmp/diff_new_pack.7SJs57/_new 2013-09-12 13:27:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package log4j (Version 1.2.15) +# spec file for package log4j # -# 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 @@ -25,9 +25,10 @@ # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) Version: 1.2.15 -Release: 104 +Release: 0 Summary: Java logging tool License: Apache-2.0 +Group: Development/Libraries/Java Url: http://logging.apache.org/log4j/ Source0: http://www.apache.org/dist/logging/log4j/%{version}/apache-log4j-%{version}.tar.bz2 #Source0: logging-log4j-1.2.13-RHCLEAN.tar.gz @@ -45,11 +46,11 @@ Patch1: %{real}-javadoc-xlink.patch Patch2: %{real}-mx4j-tools.patch Patch3: %{real}-jmx-Agent.patch -BuildRequires: jpackage-utils >= 1.6 BuildRequires: ant +BuildRequires: javapackages-tools %if ! %{bootstrap} -BuildRequires: geronimo-jaf-1_0_2-api BuildRequires: classpathx-mail +BuildRequires: geronimo-jaf-1_0_2-api BuildRequires: geronimo-jms-1_1-api BuildRequires: mx4j #!BuildIgnore: axis @@ -58,18 +59,17 @@ %endif BuildRequires: jndi %if %defined suse_version -BuildRequires: perl BuildRequires: java-devel +BuildRequires: perl BuildRequires: update-desktop-files PreReq: coreutils %else BuildRequires: %{__perl} BuildRequires: java-javadoc %endif -Requires: jpackage-utils >= 1.6 -Requires: xml-commons-apis +Requires: javapackages-tools Requires: jaxp_parser_impl -Group: Development/Libraries/Java +Requires: xml-commons-apis %if ! %{gcj_support} BuildArch: noarch %endif @@ -81,6 +81,12 @@ Requires(postun): java-gcj-compat %endif +%if %{bootstrap} +Conflicts: log4j +%else +Conflicts: log4j-mini +%endif + %description Log4j is a tool to help the programmer output log statements to a variety of output targets. @@ -90,7 +96,6 @@ %if ! %{bootstrap} %package manual -License: Apache-2.0 Summary: Java logging tool (Manual) Group: Development/Libraries/Java @@ -100,7 +105,6 @@ %package javadoc -License: Apache-2.0 PreReq: coreutils Summary: Java logging tool (Documentation) Group: Development/Libraries/Java @@ -268,7 +272,7 @@ %defattr(0644,root,root,0755) %dir %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}/* -%ghost %dir %{_javadocdir}/%{name} +%ghost %{_javadocdir}/%{name} %endif %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
