SPECS: mx4j.spec - unify java package
glen
glen at pld-linux.org
Thu Apr 19 22:45:55 CEST 2007
Author: glen Date: Thu Apr 19 20:45:55 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unify java package
---- Files affected:
SPECS:
mx4j.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: SPECS/mx4j.spec
diff -u SPECS/mx4j.spec:1.17 SPECS/mx4j.spec:1.18
--- SPECS/mx4j.spec:1.17 Wed Apr 11 20:27:35 2007
+++ SPECS/mx4j.spec Thu Apr 19 22:45:49 2007
@@ -3,11 +3,12 @@
# Conditional build:
%bcond_with doc # build docs (broken)
#
+%include /usr/lib/rpm/macros.java
Summary: Open source implementation of JMX Java API
Summary(pl.UTF-8): Implementacja API Javy JMX z otwartymi źródłami
Name: mx4j
Version: 3.0.2
-Release: 0.1
+Release: 0.2
Epoch: 0
License: Apache License
Group: Development/Languages/Java
@@ -16,6 +17,7 @@
URL: http://mx4j.sourceforge.net/
BuildRequires: ant
BuildRequires: ant-trax
+BuildRequires: axis
BuildRequires: jaf
BuildRequires: jakarta-bcel >= 5.0
BuildRequires: jakarta-commons-logging >= 1.0.1
@@ -23,6 +25,7 @@
BuildRequires: jce >= 1.2.2
BuildRequires: jpackage-utils
BuildRequires: jsse >= 1.0.2
+BuildRequires: rpm-javaprov
BuildRequires: junit >= 3.8
BuildRequires: jython >= 2.1
BuildRequires: logging-log4j >= 1.2.7
@@ -47,7 +50,7 @@
Summary(fr.UTF-8): Documentation pour %{name}
Summary(it.UTF-8): Documentazione di %{name}
Summary(pl.UTF-8): Podręcznik dla %{name}
-Group: Development/Languages/Java
+Group: Documentation
%description doc
Documentation for %{name}.
@@ -77,8 +80,6 @@
%setup -q
%build
-export JAVA_HOME="%{java_home}"
-
required_jars="\
activation \
mailapi.jar \
@@ -94,7 +95,7 @@
jaxp_transform_impl \
"
-export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+export CLASSPATH=$(build-classpath $required_jars)
#ln -sf %{_javalibdir}/commons-logging.jar lib/
#ln -sf %{_javalibdir}/mail.jar lib/
@@ -106,35 +107,30 @@
#ln -sf xdoclet-cvs20021028-patched.jar lib/xdoclet-mx4j-module.jar
cd build
-%ant jars %{?with_docs:javadocs docs}
+%ant main %{?with_docs:javadocs docs}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-cp dist/lib/%{name}-actions.jar $RPM_BUILD_ROOT%{_javadir}
-cp dist/lib/%{name}-jmx.jar $RPM_BUILD_ROOT%{_javadir}
-cp dist/lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{name}-actions.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-actions-%{version}.jar
-ln -sf %{name}-jmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jmx-%{version}.jar
-ln -sf %{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar
+cp -a dist/lib/%{name}-actions.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-actions-%{version}.jar
+cp -a dist/lib/%{name}-jmx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jmx-%{version}.jar
+cp -a dist/lib/%{name}-tools.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools-%{version}.jar
+ln -sf %{name}-actions-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-actions.jar
+ln -sf %{name}-jmx-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-jmx.jar
+ln -sf %{name}-tools-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tools.jar
# javadoc
%if %{with doc}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
%files
%defattr(644,root,root,755)
@@ -144,6 +140,7 @@
%files javadoc
%defattr(644,root,root,755)
%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -152,6 +149,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2007/04/19 20:45:49 glen
+- unify java package
+
Revision 1.17 2007/04/11 18:27:35 qboosh
- removed outdated comment
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mx4j.spec?r1=1.17&r2=1.18&f=u
More information about the pld-cvs-commit
mailing list