rpms/jaxodraw/devel jaxodraw.sh,NONE,1.1 jaxodraw.spec,1.6,1.7

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/jaxodraw/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5031

Modified Files:
	jaxodraw.spec 
Added Files:
	jaxodraw.sh 
Log Message:
Really respect CLI arguments.


--- NEW FILE jaxodraw.sh ---
#!/bin/sh
java -jar JARFILE $@


Index: jaxodraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jaxodraw/devel/jaxodraw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jaxodraw.spec	9 Jun 2010 11:34:45 -0000	1.6
+++ jaxodraw.spec	29 Jun 2010 13:04:49 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:		jaxodraw
 Version:	%{major}.%{minor}
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A Java program for drawing Feynman diagrams
 Group:		Applications/Engineering 
 License:	GPLv2+
@@ -13,6 +13,8 @@ Source0:	http://downloads.sourceforge.ne
 Source1:	http://downloads.sourceforge.net/%{name}/axodraw4j_2008_11_19.tar.gz
 # Desktop file, icon and man page
 Source2:	http://downloads.sourceforge.net/%{name}/installer-%{major}-%{minor}.tar.gz
+# Wrapper skeleton
+Source3:	jaxodraw.sh
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -70,19 +72,18 @@ for file in src/doc/{TODO,CHANGELOG,READ
  mv $file.new $file
 done
 
-# Invocation script
-cat >> %{name} << EOF
-#!/bin/sh
-java -jar %{_javadir}/%{name}.jar $@
-EOF
+# Create invocation script
+sed "s|JARFILE|%{_javadir}/%{name}.jar|g" %{SOURCE3} > %{name}
+touch -r %{SOURCE3} %{name}
 
 %build
 ant jar javadoc
 
 %install
 rm -rf %{buildroot}
-# Install jar file and symlink
+# Install jar file
 install -D -p -m 644 build/%{name}-%{major}-%{minor}.jar %{buildroot}%{_javadir}/%{name}.jar
+# Install invocation script
 install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
 
 # Desktop file and icon
@@ -126,6 +127,9 @@ rm -rf %{buildroot}
 %{_datadir}/texmf/tex/latex/axodraw4j/
 
 %changelog
+* Tue Jun 29 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-8
+- Really respect CLI arguments in shell wrapper.
+
 * Wed Jun 09 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-7
 - Respect command line arguments in shell wrapper.