From 6ac52eb5d4850965bab9342e536c8b465afc077e Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Oct 06 2010 12:25:24 +0000 Subject: * Wed Oct 6 2010 Alexander Kurtakov 0:2.0.8-7 - Drop gcj support. --- diff --git a/jakarta-oro.spec b/jakarta-oro.spec index 1733f4b..06f3974 100644 --- a/jakarta-oro.spec +++ b/jakarta-oro.spec @@ -28,17 +28,11 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%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 base_name oro -%define section free - Name: jakarta-oro Version: 2.0.8 -Release: 6.3%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: Full regular expressions API License: ASL 1.1 @@ -49,20 +43,11 @@ Patch1: %{name}-build-xml.patch URL: http://jakarta.apache.org/oro BuildRequires: jpackage-utils > 1.6 BuildRequires: ant -%if ! %{gcj_support} -Buildarch: noarch -%endif -Buildroot: %{_tmppath}/%{name}-%{version}-buildroot +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Provides: oro = %{epoch}:%{version}-%{release} Obsoletes: oro <= 0:2.0.8 - -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description The Jakarta-ORO Java classes are a set of text-processing Java classes that provide Perl5 compatible regular expressions, AWK-like regular @@ -114,55 +99,23 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink rm -rf docs/api -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT -%if %{gcj_support} -%post -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - - %files %defattr(-,root,root) %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE %{_javadir}/*.jar -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-oro-2.0.8.jar.* -%endif - %files javadoc %defattr(-,root,root) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog +* Wed Oct 6 2010 Alexander Kurtakov 0:2.0.8-7 +- Drop gcj support. + * Fri Jul 24 2009 Fedora Release Engineering - 0:2.0.8-6.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -251,3 +204,4 @@ fi * Sun Jan 14 2001 Guillaume Rousse 2.0.1-1mdk - first Mandrake release +