Hello community, here is the log from the commit of package mx4j for openSUSE:Factory checked in at 2014-07-16 16:49:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-30 22:50:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mx4j.new/mx4j.changes 2014-07-16 16:50:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 8 10:36:26 UTC 2014 - [email protected] + +- Do not depend on ant-trax. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mx4j.spec ++++++ --- /var/tmp/diff_new_pack.PGNHl0/_old 2014-07-16 16:50:05.000000000 +0200 +++ /var/tmp/diff_new_pack.PGNHl0/_new 2014-07-16 16:50:05.000000000 +0200 @@ -17,14 +17,13 @@ %define compile_and_run_tests false -%define section free - Name: mx4j Version: 3.0.2 Release: 0 Summary: Open Source Implementation of JMX Java API License: Apache-2.0 Group: Development/Libraries/Java +Url: http://mx4j.sourceforge.net/ Source0: mx4j-%{version}-src.tar.bz2 Source1: mx4j-build.policy Source2: CatalogManager.properties @@ -34,12 +33,8 @@ Patch5: mx4j-caucho-build.patch Patch6: mx4j-3.0.2-use-external-rmic.patch Patch7: mx4j-3.0.2-docbook-stylesheet-location.patch -Url: http://mx4j.sourceforge.net/ -#FIXME: /usr/bin/gij is needed during build for unknown reason BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-nodeps -BuildRequires: ant-trax BuildRequires: antlr BuildRequires: apache-commons-logging BuildRequires: axis @@ -61,10 +56,6 @@ BuildRequires: update-alternatives BuildRequires: xalan-j2 BuildRequires: xerces-j2 -#BuildRequires: burlap -#BuildRequires: hessian -BuildArch: noarch -PreReq: /usr/sbin/update-alternatives Requires: apache-commons-logging >= 1.0.1 Requires: axis >= 1.1 Requires: bcel >= 5.0 @@ -75,10 +66,14 @@ Requires: xml-commons Requires: xml-commons-apis Requires: xml-commons-resolver -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): %{_sbindir}/update-alternatives Obsoletes: openjmx Provides: jmx Provides: jmxri +BuildRoot: %{_tmppath}/%{name}-%{version}-build +#BuildRequires: burlap +#BuildRequires: hessian +BuildArch: noarch %description OpenJMX is an open source implementation of the Java(TM) Management @@ -97,7 +92,7 @@ cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/ pushd lib ln -sf $(build-classpath junit) . -if [ "%compile_and_run_tests" = "true" ] +if [ "%{compile_and_run_tests}" = "true" ] then ln -sf $(build-classpath xmlunit) . fi @@ -137,7 +132,7 @@ xdoclet/xdoclet-mx4j-module xalan-j2-serializer) export CLASSPATH=${CLASSPATH}:%{_builddir}/%{name}-%{version}/classes/core:%{_builddir}/%{name}-%{version}/build cd build -if [ "%compile_and_run_tests" = "true" ] +if [ "%{compile_and_run_tests}" = "true" ] then ant release -Dbuild.sysclasspath=first tests-report docs else @@ -145,20 +140,20 @@ fi %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -install -m 644 dist/lib/%{name}-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-impl-%{version}.jar -install -m 644 dist/lib/%{name}-jmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmx-%{version}.jar -install -m 644 dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-%{version}.jar -install -m 644 dist/lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-tools-%{version}.jar -install -m 644 dist/lib/%{name}-rjmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-rjmx-%{version}.jar -install -m 644 dist/lib/%{name}-rimpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-rimpl-%{version}.jar -install -m 644 dist/lib/%{name}-remote.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-remote-%{version}.jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}/boa -install -m 644 dist/lib/boa/%{name}-rjmx-boa.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/boa/%{name}-rjmx-boa-%{version}.jar -install -m 644 dist/lib/boa/%{name}-rimpl-boa.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/boa/%{name}-rimpl-boa-%{version}.jar -install -m 644 dist/lib/boa/%{name}-remote-boa.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/boa/%{name}-remote-boa-%{version}.jar -pushd $RPM_BUILD_ROOT%{_javadir}/%{name} +install -d -m 755 %{buildroot}%{_javadir}/%{name} +install -d -m 755 %{buildroot}%{_datadir}/%{name} +install -m 644 dist/lib/%{name}-impl.jar %{buildroot}%{_javadir}/%{name}/%{name}-impl-%{version}.jar +install -m 644 dist/lib/%{name}-jmx.jar %{buildroot}%{_javadir}/%{name}/%{name}-jmx-%{version}.jar +install -m 644 dist/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}/%{name}-%{version}.jar +install -m 644 dist/lib/%{name}-tools.jar %{buildroot}%{_javadir}/%{name}/%{name}-tools-%{version}.jar +install -m 644 dist/lib/%{name}-rjmx.jar %{buildroot}%{_javadir}/%{name}/%{name}-rjmx-%{version}.jar +install -m 644 dist/lib/%{name}-rimpl.jar %{buildroot}%{_javadir}/%{name}/%{name}-rimpl-%{version}.jar +install -m 644 dist/lib/%{name}-remote.jar %{buildroot}%{_javadir}/%{name}/%{name}-remote-%{version}.jar +install -d -m 755 %{buildroot}%{_javadir}/%{name}/boa +install -m 644 dist/lib/boa/%{name}-rjmx-boa.jar %{buildroot}%{_javadir}/%{name}/boa/%{name}-rjmx-boa-%{version}.jar +install -m 644 dist/lib/boa/%{name}-rimpl-boa.jar %{buildroot}%{_javadir}/%{name}/boa/%{name}-rimpl-boa-%{version}.jar +install -m 644 dist/lib/boa/%{name}-remote-boa.jar %{buildroot}%{_javadir}/%{name}/boa/%{name}-remote-boa-%{version}.jar +pushd %{buildroot}%{_javadir}/%{name} for jar in *-%{version}.jar ; do ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|.jar|g") done @@ -168,11 +163,11 @@ rm -f %{_javadir}/%{name}.jar %post -/usr/sbin/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0 +%{_sbindir}/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0 %postun if [ "$1" = "0" ]; then - /usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar + %{_sbindir}/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar fi %files -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
