[regexp] - Drop gcj support.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Oct 6 11:50:05 UTC 2010
commit d4beef20f4e5e99e2f4d8618685b4428be75ef41
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Oct 6 14:49:48 2010 +0300
- Drop gcj support.
regexp.spec | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 deletions(-)
---
diff --git a/regexp.spec b/regexp.spec
index caa74d3..014792d 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -28,15 +28,11 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_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 full_name jakarta-%{name}
+%global full_name jakarta-%{name}
Name: regexp
Version: 1.5
-Release: 4.3%{dist}
+Release: 5%{dist}
Epoch: 0
Summary: Simple regular expressions API
License: ASL 2.0
@@ -49,16 +45,8 @@ Requires(postun): jpackage-utils >= 0:1.6
Requires: java
BuildRequires: ant >= 1.6
-%if ! %{gcj_support}
-Buildarch: noarch
-%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Regexp is a 100% Pure Java Regular Expression package that was
@@ -98,44 +86,23 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%{__cp} -r docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
%{__rm} -rf docs/api
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf %{buildroot}
-%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
-
%files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc LICENSE
%{_javadir}/*.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
-
%files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.5-5
+- Drop gcj support.
+
* Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 1.5-4.3
- Remove javadoc ghost symlinking.
More information about the scm-commits
mailing list