Hello community, here is the log from the commit of package log4j for openSUSE:Factory checked in at 2015-03-05 15:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-12 13:27:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new/log4j-mini.changes 2015-03-05 18:14:59.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 2 13:17:50 UTC 2015 - [email protected] + +- Version bump to 1.2.17 latest 1.2 series: + * No short changelog provided - many small changes +- Try to avoid cycle between log4j and apache-common-loggings +- Remove obsoleted patch: + * log4j-jmx-Agent.patch +- Refresh patch to apply to new source: + * log4j-mx4j-tools.patch + +------------------------------------------------------------------- +Mon Mar 2 12:37:05 UTC 2015 - [email protected] + +- Cleanup with a spec-cleaner so I can understand what + is going around here. + +------------------------------------------------------------------- @@ -7 +24 @@ -Mon Sep 9 11:32:17 UTC 2013 - [email protected] +Mon Sep 9 11:06:12 UTC 2013 - [email protected] --- /work/SRC/openSUSE:Factory/log4j/log4j.changes 2013-09-12 13:27:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.log4j.new/log4j.changes 2015-03-05 18:14:59.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 2 13:17:50 UTC 2015 - [email protected] + +- Version bump to 1.2.17 latest 1.2 series: + * No short changelog provided - many small changes +- Try to avoid cycle between log4j and apache-common-loggings +- Remove obsoleted patch: + * log4j-jmx-Agent.patch +- Refresh patch to apply to new source: + * log4j-mx4j-tools.patch + +------------------------------------------------------------------- +Mon Mar 2 12:37:05 UTC 2015 - [email protected] + +- Cleanup with a spec-cleaner so I can understand what + is going around here. + +------------------------------------------------------------------- Old: ---- apache-log4j-1.2.15.tar.bz2 log4j-jmx-Agent.patch New: ---- log4j-1.2.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ log4j-mini.spec ++++++ --- /var/tmp/diff_new_pack.xdnvy6/_old 2015-03-05 18:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xdnvy6/_new 2015-03-05 18:15:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package log4j-mini # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,23 +16,20 @@ # -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} ##### WARNING: please do not edit this auto generated spec file. Use the log4j.spec! ##### %define bootstrap 1 -%define section free +# Needed as it is split to log4j-mini %define real log4j - Name: log4j-mini # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) -Version: 1.2.15 +Version: 1.2.17 Release: 0 -Summary: Java logging tool (internal featureless package breaking dependency loop) +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 +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 Source2: %{real}-logfactor5.sh @@ -46,90 +43,76 @@ Patch0: %{real}-logfactor5-userdir.patch Patch1: %{real}-javadoc-xlink.patch Patch2: %{real}-mx4j-tools.patch -Patch3: %{real}-jmx-Agent.patch BuildRequires: ant +BuildRequires: java-devel BuildRequires: javapackages-tools -%if ! %{bootstrap} -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: java-devel BuildRequires: perl BuildRequires: update-desktop-files -PreReq: coreutils -%else -BuildRequires: %{__perl} -BuildRequires: java-javadoc -%endif Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis -%if ! %{gcj_support} -BuildArch: noarch -%endif +Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build + Provides: %{real} = %{version}-%{release} -%if %{gcj_support} -BuildRequires: gnu-crypto -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif +BuildArch: noarch +%if ! %{bootstrap} +BuildRequires: classpathx-mail +BuildRequires: geronimo-jaf-1_0_2-api +BuildRequires: geronimo-jms-1_1-api +BuildRequires: mx4j +#!BuildIgnore: axis +#!BuildIgnore: apache-commons-logging +#!BuildIgnore: apache-commons-discovery +%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. - - %if ! %{bootstrap} - %package manual -Summary: Java logging tool (internal featureless package breaking dependency loop) +Summary: Java logging tool (Manual) Group: Development/Libraries/Java %description manual -Log4j is a tool to help the programmer output log statements to a -variety of output targets. - - +Documentation manual for Java logging tool log4j. %package javadoc -PreReq: coreutils Summary: Java logging tool (Documentation) Group: Development/Libraries/Java %description javadoc -Javadoc for log4j. - - - +Documentation javadoc for Java logging tool log4j. %endif %prep %setup -q -n apache-log4j-%{version} -%patch0 -b .sav -%patch1 -b .sav -%patch2 -b .sav2 -%patch3 -b .sav -%{__perl} -pi -e 's/\r//g' LICENSE -%{__perl} -pi -e 's/\r//g' NOTICE +%patch0 +%patch1 +%patch2 + +sed -i 's/\r//g' LICENSE NOTICE src/site/resources/css/*.css + # remove all the stuff we'll build ourselves -find . \( -name "*.jar" -o -name "*.class" \) -exec %__rm -f {} \; -%__rm -rf docs/api +find . \( -name "*.jar" -o -name "*.class" \) -exec rm -f {} \; +rm -rf docs/api + +# fix encoding of mailbox files +for i in contribs/JimMoore/mail*;do + iconv --from=ISO-8859-1 --to=UTF-8 "$i" > new + mv new "$i" +done %build -# javac.source=1.1 doesn't work with Sun's 1.4.2_09/1.5.0_05 -%ant \ +ant \ -Djavamail.jar=$(build-classpath javamail/mailapi) \ -Dactivation.jar=$(build-classpath jaf) \ -Djaxp.jaxp.jar.jar=$(build-classpath jaxp_parser_impl) \ @@ -145,51 +128,42 @@ %endif %install -%__rm -rf %{buildroot} # jars -%__mkdir_p %{buildroot}%{_javadir} -%__cp -a dist/lib/log4j-%{version}.jar %{buildroot}%{_javadir} +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} # javadoc -%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} -%__cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name}) -%__rm -rf docs/api -ln -s %{_javadocdir}/log4j docs/api +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name} +rm -rf docs/api +ln -s %{_javadocdir}/%{name} docs/api %endif # scripts -%__mkdir_p %{buildroot}%{_bindir} -%__install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/logfactor5 -%__install -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/chainsaw +mkdir -p %{buildroot}%{_bindir} +install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/logfactor5 +install -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/chainsaw # freedesktop.org menu entries and icons -%__mkdir_p %{buildroot}%{_datadir}/{applications,pixmaps} -%__cp -a %{SOURCE1} \ +mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps} +cp -a %{SOURCE1} \ %{buildroot}%{_datadir}/pixmaps/logfactor5.png -%__cp -a %{SOURCE3} \ +cp -a %{SOURCE3} \ %{buildroot}%{_datadir}/applications/jpackage-logfactor5.desktop -%__cp -a %{SOURCE4} \ +cp -a %{SOURCE4} \ %{buildroot}%{_datadir}/pixmaps/chainsaw.png -%__cp -a %{SOURCE6} \ +cp -a %{SOURCE6} \ %{buildroot}%{_datadir}/applications/jpackage-chainsaw.desktop # DTD and the SGML catalog (XML catalog handled in scriptlets) -%__mkdir_p %{buildroot}%{_datadir}/sgml/%{name} -%__cp -a src/main/resources/org/apache/log4j/xml/log4j.dtd \ +mkdir -p %{buildroot}%{_datadir}/sgml/%{name} +cp -a src/main/resources/org/apache/log4j/xml/log4j.dtd \ %{buildroot}%{_datadir}/sgml/%{name} -%__cp -a %{SOURCE7} \ +cp -a %{SOURCE7} \ %{buildroot}%{_datadir}/sgml/%{name}/catalog # fix perl location -%__perl -p -i -e 's|/opt/perl5/bin/perl|%{__perl}|' \ +perl -p -i -e 's|/opt/perl5/bin/perl|perl|' \ contribs/KitchingSimon/udpserver.pl %suse_update_desktop_file jpackage-chainsaw Development Debugger %suse_update_desktop_file jpackage-logfactor5 Development Debugger -%if %{gcj_support} -export CLASSPATH=$(build-classpath gnu-crypto) -%{_bindir}/aot-compile-rpm -%endif - -%clean -%__rm -rf %{buildroot} %post # Note that we're using versioned catalog, so this is always ok. @@ -203,12 +177,6 @@ file://%{_datadir}/sgml/%{name}/log4j.dtd %{_sysconfdir}/xml/catalog \ > /dev/null || : fi -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %preun if [ $1 -eq 0 ]; then @@ -217,12 +185,6 @@ %{_sysconfdir}/xml/catalog > /dev/null || : fi fi -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun # Note that we're using versioned catalog, so this is always ok. @@ -231,23 +193,6 @@ %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \ %{_datadir}/sgml/%{name}/catalog > /dev/null || : fi -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif -%if ! %{bootstrap} - -%post javadoc -%__rm -f %{_javadocdir}/%{name} -%__ln_s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ $1 -eq 0 ]; then - %__rm -f %{_javadocdir}/%{name} -fi -%endif %files %defattr(-,root,root,-) @@ -258,20 +203,16 @@ %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/sgml/%{name} -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* -%endif -%if ! %{bootstrap} +%if ! %{bootstrap} %files manual %defattr(0644,root,root,0755) %doc docs/* contribs %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* -%ghost %{_javadocdir}/%{name} +%dir %{_javadocdir}/%{name} +%{_javadocdir}/%{name}/* %endif %changelog ++++++ log4j.spec ++++++ --- /var/tmp/diff_new_pack.xdnvy6/_old 2015-03-05 18:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xdnvy6/_new 2015-03-05 18:15:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package log4j # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,22 +16,19 @@ # -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} %define bootstrap 0 -%define section free +# Needed as it is split to log4j-mini %define real log4j - Name: log4j # This line is not a comment, please do not remove it! #%(sh %{_sourcedir}/jpackage-mini-prepare.sh %{_sourcedir} %{name}) -Version: 1.2.15 +Version: 1.2.17 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 +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 Source2: %{real}-logfactor5.sh @@ -45,42 +42,27 @@ Patch0: %{real}-logfactor5-userdir.patch Patch1: %{real}-javadoc-xlink.patch Patch2: %{real}-mx4j-tools.patch -Patch3: %{real}-jmx-Agent.patch BuildRequires: ant +BuildRequires: java-devel BuildRequires: javapackages-tools -%if ! %{bootstrap} -BuildRequires: classpathx-mail -BuildRequires: geronimo-jaf-1_0_2-api -BuildRequires: geronimo-jms-1_1-api -BuildRequires: mx4j -#!BuildIgnore: axis -#!BuildIgnore: jakarta-commons-logging -#!BuildIgnore: jakarta-commons-discovery -%endif BuildRequires: jndi -%if %defined suse_version -BuildRequires: java-devel BuildRequires: perl BuildRequires: update-desktop-files -PreReq: coreutils -%else -BuildRequires: %{__perl} -BuildRequires: java-javadoc -%endif Requires: javapackages-tools Requires: jaxp_parser_impl Requires: xml-commons-apis -%if ! %{gcj_support} -BuildArch: noarch -%endif +Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{gcj_support} -BuildRequires: gnu-crypto -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat +BuildArch: noarch +%if ! %{bootstrap} +BuildRequires: classpathx-mail +BuildRequires: geronimo-jaf-1_0_2-api +BuildRequires: geronimo-jms-1_1-api +BuildRequires: mx4j +#!BuildIgnore: axis +#!BuildIgnore: apache-commons-logging +#!BuildIgnore: apache-commons-discovery %endif - %if %{bootstrap} Conflicts: log4j %else @@ -91,46 +73,42 @@ Log4j is a tool to help the programmer output log statements to a variety of output targets. - - %if ! %{bootstrap} - %package manual Summary: Java logging tool (Manual) Group: Development/Libraries/Java %description manual -Documentation for log4j. - - +Documentation manual for Java logging tool log4j. %package javadoc -PreReq: coreutils Summary: Java logging tool (Documentation) Group: Development/Libraries/Java %description javadoc -Javadoc for log4j. - - - +Documentation javadoc for Java logging tool log4j. %endif %prep %setup -q -n apache-log4j-%{version} -%patch0 -b .sav -%patch1 -b .sav -%patch2 -b .sav2 -%patch3 -b .sav -%{__perl} -pi -e 's/\r//g' LICENSE -%{__perl} -pi -e 's/\r//g' NOTICE +%patch0 +%patch1 +%patch2 + +sed -i 's/\r//g' LICENSE NOTICE src/site/resources/css/*.css + # remove all the stuff we'll build ourselves -find . \( -name "*.jar" -o -name "*.class" \) -exec %__rm -f {} \; -%__rm -rf docs/api +find . \( -name "*.jar" -o -name "*.class" \) -exec rm -f {} \; +rm -rf docs/api + +# fix encoding of mailbox files +for i in contribs/JimMoore/mail*;do + iconv --from=ISO-8859-1 --to=UTF-8 "$i" > new + mv new "$i" +done %build -# javac.source=1.1 doesn't work with Sun's 1.4.2_09/1.5.0_05 -%ant \ +ant \ -Djavamail.jar=$(build-classpath javamail/mailapi) \ -Dactivation.jar=$(build-classpath jaf) \ -Djaxp.jaxp.jar.jar=$(build-classpath jaxp_parser_impl) \ @@ -146,51 +124,42 @@ %endif %install -%__rm -rf %{buildroot} # jars -%__mkdir_p %{buildroot}%{_javadir} -%__cp -a dist/lib/log4j-%{version}.jar %{buildroot}%{_javadir} +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} # javadoc -%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} -%__cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version} -(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name}) -%__rm -rf docs/api -ln -s %{_javadocdir}/log4j docs/api +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name} +rm -rf docs/api +ln -s %{_javadocdir}/%{name} docs/api %endif # scripts -%__mkdir_p %{buildroot}%{_bindir} -%__install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/logfactor5 -%__install -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/chainsaw +mkdir -p %{buildroot}%{_bindir} +install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/logfactor5 +install -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/chainsaw # freedesktop.org menu entries and icons -%__mkdir_p %{buildroot}%{_datadir}/{applications,pixmaps} -%__cp -a %{SOURCE1} \ +mkdir -p %{buildroot}%{_datadir}/{applications,pixmaps} +cp -a %{SOURCE1} \ %{buildroot}%{_datadir}/pixmaps/logfactor5.png -%__cp -a %{SOURCE3} \ +cp -a %{SOURCE3} \ %{buildroot}%{_datadir}/applications/jpackage-logfactor5.desktop -%__cp -a %{SOURCE4} \ +cp -a %{SOURCE4} \ %{buildroot}%{_datadir}/pixmaps/chainsaw.png -%__cp -a %{SOURCE6} \ +cp -a %{SOURCE6} \ %{buildroot}%{_datadir}/applications/jpackage-chainsaw.desktop # DTD and the SGML catalog (XML catalog handled in scriptlets) -%__mkdir_p %{buildroot}%{_datadir}/sgml/%{name} -%__cp -a src/main/resources/org/apache/log4j/xml/log4j.dtd \ +mkdir -p %{buildroot}%{_datadir}/sgml/%{name} +cp -a src/main/resources/org/apache/log4j/xml/log4j.dtd \ %{buildroot}%{_datadir}/sgml/%{name} -%__cp -a %{SOURCE7} \ +cp -a %{SOURCE7} \ %{buildroot}%{_datadir}/sgml/%{name}/catalog # fix perl location -%__perl -p -i -e 's|/opt/perl5/bin/perl|%{__perl}|' \ +perl -p -i -e 's|/opt/perl5/bin/perl|perl|' \ contribs/KitchingSimon/udpserver.pl %suse_update_desktop_file jpackage-chainsaw Development Debugger %suse_update_desktop_file jpackage-logfactor5 Development Debugger -%if %{gcj_support} -export CLASSPATH=$(build-classpath gnu-crypto) -%{_bindir}/aot-compile-rpm -%endif - -%clean -%__rm -rf %{buildroot} %post # Note that we're using versioned catalog, so this is always ok. @@ -204,12 +173,6 @@ file://%{_datadir}/sgml/%{name}/log4j.dtd %{_sysconfdir}/xml/catalog \ > /dev/null || : fi -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %preun if [ $1 -eq 0 ]; then @@ -218,12 +181,6 @@ %{_sysconfdir}/xml/catalog > /dev/null || : fi fi -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun # Note that we're using versioned catalog, so this is always ok. @@ -232,23 +189,6 @@ %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \ %{_datadir}/sgml/%{name}/catalog > /dev/null || : fi -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif -%if ! %{bootstrap} - -%post javadoc -%__rm -f %{_javadocdir}/%{name} -%__ln_s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ $1 -eq 0 ]; then - %__rm -f %{_javadocdir}/%{name} -fi -%endif %files %defattr(-,root,root,-) @@ -259,20 +199,16 @@ %{_datadir}/applications/* %{_datadir}/pixmaps/* %{_datadir}/sgml/%{name} -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* -%endif -%if ! %{bootstrap} +%if ! %{bootstrap} %files manual %defattr(0644,root,root,0755) %doc docs/* contribs %files javadoc %defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* -%ghost %{_javadocdir}/%{name} +%dir %{_javadocdir}/%{name} +%{_javadocdir}/%{name}/* %endif %changelog ++++++ log4j-mx4j-tools.patch ++++++ --- /var/tmp/diff_new_pack.xdnvy6/_old 2015-03-05 18:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xdnvy6/_new 2015-03-05 18:15:00.000000000 +0100 @@ -1,8 +1,8 @@ Index: build.xml =================================================================== ---- build.xml.orig 2009-12-10 12:11:02.125266268 +0100 -+++ build.xml 2009-12-10 12:11:08.119263459 +0100 -@@ -166,7 +166,7 @@ +--- build.xml.orig ++++ build.xml +@@ -167,7 +167,7 @@ <and> <available classname="javax.management.MBeanInfo" classpath="${jmx.jar}"/> @@ -10,4 +10,4 @@ + <available classname="mx4j.tools.adaptor.AdaptorServerSocketFactory"> <classpath> <pathelement location="${jmx.jar}"/> - <pathelement location="${jmx-extra.jar}"/> + <pathelement location="${javaee-api.jar}"/> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
