[mx4j] Drop a lot of ancient things.
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Jan 26 22:28:09 UTC 2012
commit e2823a96c17becf47ab46876d8225fe12e64e614
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Fri Jan 27 00:27:43 2012 +0200
Drop a lot of ancient things.
mx4j-no-poa.patch | 20 ------------
mx4j.spec | 88 +++++++++++-----------------------------------------
2 files changed, 19 insertions(+), 89 deletions(-)
---
diff --git a/mx4j.spec b/mx4j.spec
index c7f44d9..d9c16ba 100644
--- a/mx4j.spec
+++ b/mx4j.spec
@@ -28,11 +28,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define with_tests 0
-
Name: mx4j
Version: 3.0.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Epoch: 1
Summary: Open source implementation of JMX Java API
License: ASL 1.1
@@ -44,24 +42,18 @@ Patch0: mx4j-javaxssl.patch
Patch1: mx4j-%{version}.patch
Patch2: mx4j-build.patch
Patch3: mx4j-docbook.patch
-#Patch4: mx4j-no-poa.patch
Patch5: mx4j-caucho-build.patch
Patch6: mx4j-no-iiop.patch
URL: http://mx4j.sourceforge.net/
BuildRequires: jpackage-utils > 0:1.6
BuildRequires: ant >= 0:1.6
-BuildRequires: ant-nodeps
BuildRequires: ant-apache-resolver
BuildRequires: javamail >= 0:1.2-5jpp
BuildRequires: log4j >= 0:1.2.7
BuildRequires: apache-commons-logging >= 0:1.0.1
BuildRequires: xml-commons-apis
BuildRequires: bcel >= 0:5.0
-BuildRequires: jsse >= 0:1.0.2-6jpp
-BuildRequires: jce >= 0:1.2.2
BuildRequires: coreutils
-BuildRequires: xjavadoc
-BuildRequires: xdoclet
BuildRequires: axis >= 0:1.1
BuildRequires: wsdl4j
BuildRequires: apache-commons-discovery
@@ -71,15 +63,7 @@ BuildRequires: xml-commons-resolver
BuildRequires: xml-commons
BuildRequires: xerces-j2
BuildRequires: dos2unix
-%if %{with_tests}
-BuildRequires: ant-junit
-BuildRequires: burlap >= 3.0.8
-BuildRequires: caucho-services
-BuildRequires: hessian >= 3.0.8
-BuildRequires: junit >= 0:3.7.1
-BuildRequires: xmlunit
-%endif
-Buildarch: noarch
+BuildArch: noarch
Requires(pre): /bin/rm
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
@@ -88,12 +72,9 @@ Requires: log4j >= 0:1.2.7
Requires: apache-commons-logging >= 0:1.0.1
Requires: xml-commons-apis
Requires: bcel >= 0:5.0
-Requires: jsse >= 0:1.0.2-6jpp
-Requires: jce >= 0:1.2.2
Requires: axis >= 0:1.1
Requires: xml-commons-resolver
Requires: xml-commons
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%description
OpenJMX is an open source implementation of the
@@ -102,6 +83,7 @@ Java(TM) Management Extensions (JMX).
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -124,7 +106,6 @@ Documentation for %{name}.
%patch1 -p0
%patch2 -b .sav
%patch3 -p1
-#%patch4 -p0
%patch5 -p1
%patch6 -p1
@@ -132,13 +113,6 @@ cp %{SOURCE1} build
cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/
pushd lib
-%if %{with_tests}
- ln -sf $(build-classpath junit) .
- ln -sf $(build-classpath xmlunit) .
- ln -sf $(build-classpath burlap) .
- ln -sf $(build-classpath caucho-services) .
- ln -sf $(build-classpath hessian) .
-%endif
ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
ln -sf $(build-classpath xerces-j2) xercesImpl.jar
ln -sf $(build-classpath xalan-j2) xalan.jar
@@ -151,58 +125,35 @@ pushd lib
ln -sf $(build-classpath wsdl4j) .
ln -sf $(build-classpath commons-discovery) .
ln -sf $(build-classpath servlet25) servlet.jar
-# ln -sf $(build-classpath jython) .
- ln -sf $(build-classpath jsse) .
- ln -sf $(build-classpath jsse/jcert) jcert.jar
- ln -sf $(build-classpath jsse/jnet) jnet.jar
- ln -sf $(build-classpath jaas) .
ln -sf $(build-classpath javamail/mail) .
ln -sf $(build-classpath xml-commons-resolver) .
- ln -sf $(build-classpath xdoclet/xdoclet) .
- ln -sf $(build-classpath xdoclet/xdoclet-jmx-module) .
- ln -sf $(build-classpath xdoclet/xdoclet-mx4j-module) .
popd
%build
-export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-nodeps jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver xalan-j2-serializer"
+export OPT_JAR_LIST="ant/ant-junit junit xmlunit jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver xalan-j2-serializer"
cd build
-%if %{with_tests}
-ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
-%else
ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
-%endif
%install
-rm -rf $RPM_BUILD_ROOT
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 -m 644 dist/lib/%{name}-impl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-impl.jar
+install -m 644 dist/lib/%{name}-jmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmx.jar
+install -m 644 dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
+install -m 644 dist/lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-tools.jar
+install -m 644 dist/lib/%{name}-rjmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-rjmx.jar
+install -m 644 dist/lib/%{name}-rimpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-rimpl.jar
+install -m 644 dist/lib/%{name}-remote.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-remote.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}
- for jar in *-%{version}.jar ; do
- ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|.jar|g")
- done
-popd
+install -m 644 dist/lib/boa/%{name}-rjmx-boa.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/boa/%{name}-rjmx-boa.jar
+install -m 644 dist/lib/boa/%{name}-rimpl-boa.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/boa/%{name}-rimpl-boa.jar
+install -m 644 dist/lib/boa/%{name}-remote-boa.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/boa/%{name}-remote-boa.jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
dos2unix dist/docs/styles.css README.txt LICENSE.txt
-cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%pre
rm -f %{_javadir}/%{name}.jar
@@ -216,21 +167,20 @@ if [ "$1" = "0" ]; then
fi
%files
-%defattr(-,root,root,-)
%{_javadir}/%{name}
%doc LICENSE.txt
%doc README.txt
%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files manual
-%defattr(-,root,root,-)
%doc dist/docs/*
%changelog
+* Fri Jan 27 2012 Alexander Kurtakov <akurtako at redhat.com> 1:3.0.1-14
+- Drop a lot of ancient things.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list