[automaton] * Tue Nov 23 2010 Jerry James <loganjerry at gmail.com> - 1.11r4-1 - Upgrade to 1.11-4 - Drop the gcj b

Jerry James jjames at fedoraproject.org
Tue Nov 23 18:47:46 UTC 2010


commit b5db9bdaad7853efd36461c0b2c1dfe49d1d319a
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Nov 23 11:47:34 2010 -0700

    * Tue Nov 23 2010 Jerry James <loganjerry at gmail.com> - 1.11r4-1
    - Upgrade to 1.11-4
    - Drop the gcj bits
    - Drop the BuildRoot definition

 .gitignore     |    2 +-
 automaton.spec |   37 ++++++-------------------------------
 sources        |    2 +-
 3 files changed, 8 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 355921b..a5ac327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-automaton-1.11-3.tar.gz
+automaton-1.11-4.tar.gz
diff --git a/automaton.spec b/automaton.spec
index 4e953e9..2176e92 100644
--- a/automaton.spec
+++ b/automaton.spec
@@ -1,10 +1,8 @@
 # Upstream uses version-release.  Control the madness here.
 %global upver 1.11
-%global uprel 3
+%global uprel 4
 %global filever %{upver}-%{uprel}
 
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name:           automaton
 Version:        %{upver}r%{uprel}
 Release:        1%{?dist}
@@ -14,18 +12,11 @@ Group:          Development/Libraries/Java
 License:        BSD
 URL:            http://www.brics.dk/automaton/
 Source:         http://www.brics.dk/~amoeller/%{name}/%{name}-%{filever}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, java-devel, jpackage-utils
 Requires:       java, jpackage-utils
 
-%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
 
 %description
 This Java package contains a DFA/NFA (finite-state automata) implementation
@@ -64,24 +55,6 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
 mv doc $RPM_BUILD_ROOT%{_javadocdir}/automaton-%{version}
 ln -s automaton-%{version} $RPM_BUILD_ROOT%{_javadocdir}/automaton
 
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%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
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,15 +62,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README
 %{_javadir}/automaton*.jar
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/automaton*
 
 %changelog
+* Tue Nov 23 2010 Jerry James <loganjerry at gmail.com> - 1.11r4-1
+- Upgrade to 1.11-4
+- Drop the gcj bits
+- Drop the BuildRoot definition
+
 * Tue Jul  6 2010 Jerry James <loganjerry at gmail.com> - 1.11r3-1
 - Upgrade to 1.11-3
 
diff --git a/sources b/sources
index 6bf082b..5dc63f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0363f0af95ef85ad44153ff7f38bd128  automaton-1.11-3.tar.gz
+14826cc72a09ad862cb11be9313a9079  automaton-1.11-4.tar.gz


More information about the scm-commits mailing list