Hello community, here is the log from the commit of package mx4j for openSUSE:Factory checked in at 2014-08-01 19:27:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mx4j (Old) and /work/SRC/openSUSE:Factory/.mx4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mx4j" Changes: -------- --- /work/SRC/openSUSE:Factory/mx4j/mx4j.changes 2014-07-16 16:50:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mx4j.new/mx4j.changes 2014-08-01 19:27:05.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 21 10:58:20 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner and fixup update-alternatives code + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mx4j.spec ++++++ --- /var/tmp/diff_new_pack.h7ieZe/_old 2014-08-01 19:27:06.000000000 +0200 +++ /var/tmp/diff_new_pack.h7ieZe/_new 2014-08-01 19:27:06.000000000 +0200 @@ -66,10 +66,11 @@ Requires: xml-commons Requires: xml-commons-apis Requires: xml-commons-resolver -Requires(post): %{_sbindir}/update-alternatives -Obsoletes: openjmx +Requires(post): update-alternatives +Obsoletes: openjmx < %{version} Provides: jmx Provides: jmxri +Provides: openjmx = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: burlap #BuildRequires: hessian @@ -88,8 +89,7 @@ %patch6 -p1 %patch7 -p1 cp %{SOURCE1} build -#cp %{SOURCE2} build -cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/ +cp %{SOURCE2} build pushd lib ln -sf $(build-classpath junit) . if [ "%{compile_and_run_tests}" = "true" ] @@ -158,9 +158,9 @@ ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|.jar|g") done popd - -%pre -rm -f %{_javadir}/%{name}.jar +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jmxri.jar %{buildroot}%{_javadir}/jmxri.jar %post %{_sbindir}/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0 @@ -176,5 +176,7 @@ %{_javadir}/%{name}/*.jar %dir %{_javadir}/%{name}/boa %{_javadir}/%{name}/boa/*.jar +%{_javadir}/jmxri.jar +%ghost %{_sysconfdir}/alternatives/jmxri.jar %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org