rpms/mx4j/devel mx4j.spec,1.71,1.72
Andrew Overholt
overholt at fedoraproject.org
Fri Jan 8 21:27:14 UTC 2010
Author: overholt
Update of /cvs/pkgs/rpms/mx4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5737
Modified Files:
mx4j.spec
Log Message:
* Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 1:3.0.1-9.11
- Remove gcj support
- Add cleaning of buildroot to beginning of %install
- Remove old unversioned Obsoletes/Provides
- Remove touching of RPM_BUILD_ROOT in %prep
- Fix Groups
- Fix line endings in styles.css, README.txt, and LICENSE.txt
- Add %doc files to main package
- Fix mixed tabs and spaces
Index: mx4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- mx4j.spec 25 Jul 2009 15:28:11 -0000 1.71
+++ mx4j.spec 8 Jan 2010 21:27:14 -0000 1.72
@@ -28,23 +28,15 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _without_tests 1
-
-%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
-%define without_tests %{?_without_tests:1}%{!?_without_tests:0}
-
-%define _gcj_support 1
-%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 section free
+%define with_tests 0
Name: mx4j
Version: 3.0.1
-Release: 9.9%{?dist}
-Epoch: 1
+Release: 9.10%{?dist}
+Epoch: 1
Summary: Open source implementation of JMX Java API
License: ASL 1.1
-Group: Development/Libraries/Java
+Group: Development/Libraries
Source0: %{name}-%{version}-src.tar.gz
Source1: %{name}-build.policy
Source2: CatalogManager.properties
@@ -52,22 +44,22 @@ Patch0: mx4j-javaxssl.patch
Patch1: mx4j-%{version}.patch
Patch2: mx4j-build.patch
Patch3: mx4j-docbook.patch
-Patch4: mx4j-no-poa.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-trax
-BuildRequires: ant-apache-resolver
-BuildRequires: jaf
-BuildRequires: javamail >= 0:1.2-5jpp
-BuildRequires: log4j >= 0:1.2.7
-BuildRequires: jakarta-commons-logging >= 0:1.0.1
+BuildRequires: ant-apache-resolver
+BuildRequires: jaf
+BuildRequires: javamail >= 0:1.2-5jpp
+BuildRequires: log4j >= 0:1.2.7
+BuildRequires: jakarta-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: jsse >= 0:1.0.2-6jpp
+BuildRequires: jce >= 0:1.2.2
BuildRequires: coreutils
BuildRequires: xjavadoc
BuildRequires: xdoclet
@@ -81,61 +73,48 @@ BuildRequires: xml-commons
BuildRequires: xerces-j2
%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: burlap >= 3.0.8
+BuildRequires: caucho-services
+BuildRequires: hessian >= 3.0.8
+BuildRequires: junit >= 0:3.7.1
BuildRequires: xmlunit
%endif
-%if ! %{gcj_support}
Buildarch: noarch
-%endif
-Requires(pre): /bin/rm
+Requires(pre): /bin/rm
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
-Requires: jaf
-Requires: javamail >= 0:1.2-5jpp
-Requires: log4j >= 0:1.2.7
-Requires: jakarta-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
+Requires: jaf
+Requires: javamail >= 0:1.2-5jpp
+Requires: log4j >= 0:1.2.7
+Requires: jakarta-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
-Obsoletes: openjmx
-Provides: jmxri
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description
OpenJMX is an open source implementation of the
Java(TM) Management Extensions (JMX).
%package javadoc
-Group: Development/Documentation
+Group: Documentation
Summary: Javadoc for %{name}
-Obsoletes: openjmx-javadoc
%description javadoc
Javadoc for %{name}.
%package manual
-Group: Development/Libraries/Java
+Group: Development/Libraries
Summary: Documentation for %{name}
%description manual
Documentation for %{name}.
%prep
-rm -rf $RPM_BUILD_ROOT
-
%setup -q
# FIXME To enable iiop when rmic becomes available
@@ -199,6 +178,7 @@ ant -Dbuild.sysclasspath=first compile.j
%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
@@ -220,13 +200,10 @@ pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
popd
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+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}
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -236,34 +213,16 @@ rm -f %{_javadir}/%{name}.jar
%post
%{_sbindir}/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%postun
if [ "$1" = "0" ]; then
- %{_sbindir}/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
+ %{_sbindir}/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
fi
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(0644,root,root,0755)
%{_javadir}/%{name}
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-3.0.1.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-tools-3.0.1.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-remote-boa-3.0.1.jar.*
-%endif
+%doc LICENSE.txt
+%doc README.txt
%files javadoc
%defattr(0644,root,root,0755)
@@ -275,6 +234,16 @@ fi
%doc dist/docs/*
%changelog
+* Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 1:3.0.1-9.11
+- Remove gcj support
+- Add cleaning of buildroot to beginning of %%install
+- Remove old unversioned Obsoletes/Provides
+- Remove touching of RPM_BUILD_ROOT in %%prep
+- Fix Groups
+- Fix line endings in styles.css, README.txt, and LICENSE.txt
+- Add %%doc files to main package
+- Fix mixed tabs and spaces
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.0.1-9.9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -410,10 +379,10 @@ fi
- Use absolute paths for rebuild-gcj-db.
* Fri May 6 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_7fc
-- Fix ownership in %{_javadir}.
+- Fix ownership in %%{_javadir}.
* Thu May 5 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_6fc
-- Add dependencies for %post and %postun scriptlets (#156901).
+- Add dependencies for %%post and %%postun scriptlets (#156901).
* Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_5fc
- BC-compile the combined jarfile.
More information about the fedora-extras-commits
mailing list