packages: sablecc/sablecc.spec - fixed all that was wrong to be right

[glen]

Author: glen                         Date: Fri Dec 30 10:24:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed all that was wrong to be right

---- Files affected:
packages/sablecc:
   sablecc.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/sablecc/sablecc.spec
diff -u packages/sablecc/sablecc.spec:1.8 packages/sablecc/sablecc.spec:1.9
--- packages/sablecc/sablecc.spec:1.8	Fri Dec 30 04:16:25 2011
+++ packages/sablecc/sablecc.spec	Fri Dec 30 11:24:48 2011
@@ -1,22 +1,24 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	SableCC - the Sable Research Group's Compiler Compiler
 Summary(pl.UTF-8):	SableCC - kompilator kompilatorów z Sable Research Group
 Name:		sablecc
 Version:	3.2
-Release:	0.1
+Release:	0.2
 License:	LGPL
 Group:		Development/Languages/Java
-Source0:	http://dl.sourceforge.net/sablecc/%{name}-%{version}.zip
+Source0:	http://downloads.sourceforge.net/sablecc/%{name}-%{version}.zip
 # Source0-md5:	0c38a98fddc374e5d4b67bf4c2ff4c19
 URL:		http://sablecc.sourceforge.net/
 BuildRequires:	ant >= 1.5
-BuildRequires:	xerces-j
-Requires:	jre
+BuildRequires:	java-xerces
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 SableCC is an object-oriented framework that generates compilers (and
 interpreters) in the Java programming language. This framework is
@@ -46,22 +48,21 @@
 %prep
 %setup -q
 
-%build
-ant jar
-
-cat >bin/sablecc <<EOF
+cat > bin/sablecc <<'EOF'
 #!/bin/sh
 
-exec java -jar %{_javalibdir}/%{name}-%{version}.jar \$@
+exec java -jar %{_javadir}/%{name}.jar "$@"
 EOF
 
+%build
+%ant jar
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
 
-install -d $RPM_BUILD_ROOT{%{_javalibdir},%{_bindir}}
-cp lib/%{name}.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javalibdir}/%{name}-%{version}.jar
-cp bin/sablecc $RPM_BUILD_ROOT%{_bindir}
+cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -p bin/sablecc $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +71,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS README.html THANKS
 %attr(755,root,root) %{_bindir}/sablecc
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -78,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/12/30 10:24:48  glen
+- fixed all that was wrong to be right
+
 Revision 1.8  2011/12/30 03:16:25  aredridel
 - Fix $@ in script
 
================================================================

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