[libformula] Related: rhbz#749103 drop gcj aot
Caolan McNamara
caolanm at fedoraproject.org
Fri Oct 28 08:57:36 UTC 2011
commit 9de44d55f58497c51ada418e368c357e7b82c8df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 28 09:57:32 2011 +0100
Related: rhbz#749103 drop gcj aot
libformula.spec | 39 ++++-----------------------------------
1 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/libformula.spec b/libformula.spec
index 22406fd..25d9c40 100644
--- a/libformula.spec
+++ b/libformula.spec
@@ -1,9 +1,6 @@
-# Use rpmbuild --without gcj to disable native bits
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
Name: libformula
Version: 1.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Formula Parser
License: LGPLv2+
Group: System Environment/Libraries
@@ -12,13 +9,7 @@ URL: http://reporting.pentaho.org/
BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase >= 1.1.3
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: java, jpackage-utils, jakarta-commons-logging, libbase >= 1.1.3
-%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: libformula-1.1.2.build.patch
%description
@@ -31,9 +22,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}.
@@ -61,43 +49,24 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%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}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%changelog
+* Fri Oct 28 2011 Caolán McNamara <caolanm at redhat.com> 1.1.3-3
+- Related: rhbz#749103 drop gcj aot
+
* Mon Feb 07 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