[jarjar] Get the new spec file back in again

[mef]

commit ad2b48b10ca7913c42d8ecdab35c77c956414008
Author: Mary Ellen Foster <mefoster at gmail.com>
Date:   Fri Oct 1 11:38:20 2010 +0100

    Get the new spec file back in again

 jarjar.spec |   67 ++++++++++++++++++++++++----------------------------------
 1 files changed, 28 insertions(+), 39 deletions(-)
---
diff --git a/jarjar.spec b/jarjar.spec
index 5b9d0ae..579ab7e 100644
--- a/jarjar.spec
+++ b/jarjar.spec
@@ -28,37 +28,34 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name:           jarjar
-Version:        0.9
-Release:        5%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Jar Jar Links
-License:        GPLv2+
-URL:            http://tonicsystems.com/products/jarjar/
+License:        ASL 2.0
+URL:            http://code.google.com/p/jarjar/
 Group:          Development/Tools
-Source0:        http://downloads.sourceforge.net/jarjar/jarjar-src-0.9.zip
-Source1:        jarjar-0.9.pom
+# svn export http://jarjar.googlecode.com/svn/tags/release-1-0/jarjar jarjar-1.0
+Source0:        jarjar-src-1.0.zip
+Source1:        jarjar-1.0.pom
+# Change version from "snapshot" to "1.0"
+Patch0:			jarjar-1.0-build_xml.patch
+# Add a cast to make a method unambiguous
+Patch1:			jarjar-AntJarProcessor-cast.patch
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  junit
-BuildRequires:  asm2
+BuildRequires:  objectweb-asm
 BuildRequires:  gnu-regexp
 BuildRequires:  maven2
-Requires:  asm2
+Requires:  objectweb-asm
 Requires:  gnu-regexp
 Requires:  jpackage-utils >= 0:1.7.2
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):    jpackage-utils >= 0:1.7.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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -91,15 +88,20 @@ BuildArch:	noarch
 %prep
 %setup -q -n %{name}-%{version}
 # remove all binary libs
-find . -name "*.jar" | xargs -t rm
+rm -f lib/*.jar
+%patch0 -p1
+%patch1 -p1
 
 %build
 pushd lib
 ln -sf $(build-classpath gnu-regexp)
-ln -sf $(build-classpath asm2/asm2) asm.jar
-ln -sf $(build-classpath asm2/asm2-commons) asm-commons.jar
-ln -sf $(build-classpath asm2/asm2-util) asm-util.jar
+ln -sf $(build-classpath objectweb-asm/asm-3.1) asm-3.1.jar
+ln -sf $(build-classpath objectweb-asm/asm-commons-3.1) asm-commons-3.1.jar
+%if 0%{?fedora} <= 13
 ln -sf $(build-classpath maven2/plugin-api) maven-plugin-api.jar
+%else
+ln -sf $(build-classpath maven2/maven-plugin-api) maven-plugin-api.jar
+%endif
 popd
 export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=$(build-classpath ant)
@@ -120,10 +122,6 @@ install -m 644 dist/%{name}-plugin-%{version}.jar \
 
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
 %add_to_maven_depmap tonic jarjar %{version} JPP %{name}
 %add_to_maven_depmap com.tonicsystems jarjar %{version} JPP %{name}
 %add_to_maven_depmap tonic jarjar-util %{version} JPP %{name}-util
@@ -146,21 +144,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 
 %files
 %defattr(-,root,root,-)
@@ -171,9 +157,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}-util.jar
 %{_datadir}/maven2/poms/*
 %config(noreplace) %{_mavendepmapfragdir}/*
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files maven2-plugin
 %defattr(-,root,root,-)
@@ -186,6 +169,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Sep 29 2010 Mary Ellen Foster <mefoster at gmail.com> 1.0-1
+- Update to 1.0
+- Change project URLs
+- Fix FTBFS
+- Remove gcj stuff
+
 * Fri Feb  5 2010 Mary Ellen Foster <mefoster at gmail.com> 0.9-5
 - Make javadoc noarch