[pentaho-libxml] Related: rhbz#749103 drop gcj aot
Caolan McNamara
caolanm at fedoraproject.org
Fri Oct 28 09:22:28 UTC 2011
commit 185f7b51a807ed745f4a9d49bdcc810fb3f02242
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 28 10:22:24 2011 +0100
Related: rhbz#749103 drop gcj aot
pentaho-libxml.spec | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
---
diff --git a/pentaho-libxml.spec b/pentaho-libxml.spec
index 2f51953..1e4c3de 100644
--- a/pentaho-libxml.spec
+++ b/pentaho-libxml.spec
@@ -1,10 +1,8 @@
-# Use rpmbuild --without gcj to disable native bits
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
%define origname libxml
Name: pentaho-libxml
Version: 1.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Namespace aware SAX-Parser utility library
License: LGPLv2+
Group: System Environment/Libraries
@@ -13,13 +11,7 @@ URL: http://reporting.pentaho.org/
BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase, libloader
Buildroot: %{_tmppath}/%{origname}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: java, jpackage-utils, libbase >= 1.1.2, libloader >= 1.1.2
-%if %{with_gcj}
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
BuildArch: noarch
-%endif
Patch0: libxml-1.1.2-build.patch
%description
@@ -31,9 +23,6 @@ Summary: Javadoc for %{name}
Group: Development/Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
-%if %{with_gcj}
-BuildArch: noarch
-%endif
%description javadoc
Javadoc for %{name}.
@@ -65,43 +54,24 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{origname}
cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{origname}
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(0644,root,root,0755)
%doc licence-LGPL.txt README.txt ChangeLog.txt
%{_javadir}/%{origname}-%{version}.jar
%{_javadir}/%{origname}.jar
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{origname}
%changelog
+* Fri Oct 28 2011 Caolán McNamara <caolanm at redhat.com> - 1.1.3-3
+- Related: rhbz#749103 drop gcj aot
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list