[packages/java-libextractor] - updated to 1.0.0 - updated destdir patch - default to use java/javac commands, gcj as bcond

[qboosh]

commit 1a991849afb0c6e34c5b7d4daf4712f972d77fa5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 13 18:51:09 2012 +0100

    - updated to 1.0.0
    - updated destdir patch
    - default to use java/javac commands, gcj as bcond

 java-libextractor.spec          | 22 +++++++++++-----------
 libextractor-java-destdir.patch | 10 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/java-libextractor.spec b/java-libextractor.spec
index f3d4bbc..b99ba89 100644
--- a/java-libextractor.spec
+++ b/java-libextractor.spec
@@ -1,25 +1,25 @@
 #
 # Conditional build:
-%bcond_with	javac	# use java/javac instead of gij/gcj
+%bcond_with	gcj	# use gij/gcj instead of java/javac
 #
 Summary:	Java support for libextractor
 Summary(pl.UTF-8):	Wiązania Javy dla biblioteki libextractor
 Name:		java-libextractor
-Version:	0.5.18
+Version:	1.0.0
 Release:	1
-License:	GPL v2+
+License:	GPL v3+
 Group:		Libraries/Java
-Source0:	http://gnunet.org/libextractor/download/libextractor-java-%{version}.tar.gz
-# Source0-md5:	e04e9984f0fa09188bab31410a6b3106
+Source0:	http://ftp.gnu.org/gnu/libextractor/libextractor-java-%{version}.tar.gz
+# Source0-md5:	f35a422e30f9aa0130718bae798e5dfd
 Patch0:		libextractor-java-destdir.patch
-URL:		http://gnunet.org/libextractor/
+URL:		http://www.gnu.org/software/libextractor/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	libextractor-devel >= %{version}
-%if %{with javac}
-BuildRequires:	jdk
-%else
+%if %{with gcj}
 BuildRequires:	gcc-java
+%else
+BuildRequires:	jdk
 %endif
 Requires:	jre
 Requires:	libextractor >= %{version}
@@ -42,7 +42,7 @@ Wiązania Javy dla biblioteki libextractor.
 # . in CLASSPATH required for configure test
 export CLASSPATH=.
 %configure \
-	%{!?with_javac:JAVA=gij}
+	%{?with_gavac:JAVA=gij}
 
 %{__make}
 
@@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libextractor_java.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libextractor_java.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/libextractor-java-destdir.patch b/libextractor-java-destdir.patch
index 59d6f21..dceab01 100644
--- a/libextractor-java-destdir.patch
+++ b/libextractor-java-destdir.patch
@@ -1,10 +1,10 @@
---- libextractor-java-0.5.6/org/gnunet/libextractor/Makefile.am.orig	2005-10-10 18:51:03.000000000 +0200
-+++ libextractor-java-0.5.6/org/gnunet/libextractor/Makefile.am	2005-10-28 21:20:33.568473472 +0200
-@@ -8,5 +8,5 @@
+--- libextractor-java-1.0.0/org/gnu/libextractor/Makefile.am.orig	2012-12-13 18:15:46.169403353 +0100
++++ libextractor-java-1.0.0/org/gnu/libextractor/Makefile.am	2012-12-13 18:30:38.149384761 +0100
+@@ -10,5 +10,5 @@
    Xtract.java
  
  install-exec-local:
 -	mkdir -p $(prefix)/share/java
--	cd ../../..; @JAR@ -cvf $(prefix)/share/java/libextractor.jar org/gnunet/libextractor/*.class
+-	cd ../../..; @JAR@ -cvf $(prefix)/share/java/libextractor.jar org/gnu/libextractor/*.class
 +	mkdir -p $(DESTDIR)$(prefix)/share/java
-+	cd ../../..; @JAR@ -cvf $(DESTDIR)$(prefix)/share/java/libextractor.jar org/gnunet/libextractor/*.class
++	cd ../../..; @JAR@ -cvf $(DESTDIR)$(prefix)/share/java/libextractor.jar org/gnu/libextractor/*.class
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-libextractor.git/commitdiff/1a991849afb0c6e34c5b7d4daf4712f972d77fa5