SPECS: jflex.spec - make it build without network - cleanups

[glen]

Author: glen                         Date: Sun Dec  2 16:14:44 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make it build without network
- cleanups

---- Files affected:
SPECS:
   jflex.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/jflex.spec
diff -u SPECS/jflex.spec:1.8 SPECS/jflex.spec:1.9
--- SPECS/jflex.spec:1.8	Sun Sep  9 12:55:18 2007
+++ SPECS/jflex.spec	Sun Dec  2 17:14:39 2007
@@ -1,16 +1,28 @@
 # $Revision$, $Date$
+# TODO
+# - compile Source1, Source2 in spec (sources in src/)
+%include	/usr/lib/rpm/macros.java
 Summary:	Fast Scanner Generator
 Summary(pl.UTF-8):	Szybki generator skanerów leksykalnych
 Name:		jflex
 Version:	1.4.1
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Development/Languages/Java
-#Source0Download: http://jflex.de/download.html
+# Source0Download: http://jflex.de/download.html
 Source0:	http://jflex.de/%{name}-%{version}.tar.gz
 # Source0-md5:	9e4be6e826e6b344e84c0434d6fd4b46
+Source1:	http://jflex.sourceforge.net/jar/stable/JFlex-%{version}.jar
+# Source1-md5:	626c0c66135a48c042d3b35af95d274d
+Source2:	http://jflex.sourceforge.net/jar/stable/java_cup_10k-lsf.jar
+# Source2-md5:	26aef43b31cf3e0b581017e75a325b7b
 URL:		http://jflex.de/
-# javadocs disappeared
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
+%if %(locale -a | grep -q '^en_US$'; echo $?)
+BuildRequires:	glibc-localedb-all
+%endif
 Obsoletes:	jflex-javadoc
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,42 +66,29 @@
 
 %prep
 # use -c because of top-level symlink
-%setup -q -c
+%setup -qc
+install -d jflex/tools
+ln -s %{SOURCE1} jflex/tools/JFlex.jar
+ln -s %{SOURCE2} jflex/tools/java_cup.jar
 
 %build
-cd jflex/src
-%{ant} gettools realclean jar
+export LC_ALL=en_US # source code not US-ASCII
+%ant -f jflex/src/build.xml \
+	realclean jar
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -p jflex/lib/JFlex.jar \
-	$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-cd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}.jar; do
-	ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
-done
-cd -
-
-# javadoc
-#install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-#cp -pr api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-#ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+cp -a jflex/lib/JFlex.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -97,17 +96,16 @@
 %doc jflex/doc/COPYRIGHT jflex/doc/*.{html,css,gif,png}
 %{_javadir}/*.jar
 
-#%files javadoc
-#%defattr(644,root,root,755)
-#%{_javadocdir}/%{name}-%{version}
-#%ghost %{_javadocdir}/%{name}
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007-12-02 16:14:39  glen
+- make it build without network
+- cleanups
+
 Revision 1.8  2007-09-09 10:55:18  qboosh
 - use setup -c for clean build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jflex.spec?r1=1.8&r2=1.9&f=u