rpms/jaxodraw/F-13 jaxodraw.spec,1.3,1.4

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/jaxodraw/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24169

Modified Files:
	jaxodraw.spec 
Log Message:
Respect command line arguments.


Index: jaxodraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jaxodraw/F-13/jaxodraw.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- jaxodraw.spec	29 May 2010 11:14:56 -0000	1.3
+++ jaxodraw.spec	9 Jun 2010 12:01:03 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:		jaxodraw
 Version:	%{major}.%{minor}
-Release:	5%{?dist}
+Release:	7%{?dist}
 Summary:	A Java program for drawing Feynman diagrams
 Group:		Applications/Engineering 
 License:	GPLv2+
@@ -11,12 +11,8 @@ URL:		http://jaxodraw.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{major}-%{minor}_src.tar.gz
 # LaTeX file for exporting figures
 Source1:	http://downloads.sourceforge.net/%{name}/axodraw4j_2008_11_19.tar.gz
-
-# The files below have been taken from the upstream SVN at
-# http://jaxodraw.svn.sourceforge.net/viewvc/jaxodraw/trunk/installer/OS/Linux
-Source2:	%{name}.desktop
-Source3:	%{name}.png
-Source4:	%{name}.1
+# Desktop file, icon and man page
+Source2:	http://downloads.sourceforge.net/%{name}/installer-%{major}-%{minor}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -40,10 +36,10 @@ keyboard entries. Graphs may be exported
 be saved in XML files to be used in later sessions.
 
 %package javadoc
-Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
+Summary:	Javadocs for %{name}
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+Requires:	jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -64,7 +60,7 @@ You need this if you want the export to 
 compile LaTeX files generated with jaxodraw.
 
 %prep
-%setup -q -n JaxoDraw-%{major}-%{minor} -a 1
+%setup -q -n JaxoDraw-%{major}-%{minor} -a 1 -a 2
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 
 # Convert documentation encoding
@@ -77,7 +73,7 @@ done
 # Invocation script
 cat >> %{name} << EOF
 #!/bin/sh
-java -jar %{_javadir}/%{name}.jar
+java -jar %{_javadir}/%{name}.jar $@
 EOF
 
 %build
@@ -85,13 +81,15 @@ ant jar javadoc
 
 %install
 rm -rf %{buildroot}
+# Install jar file and symlink
 install -D -p -m 644 build/%{name}-%{major}-%{minor}.jar %{buildroot}%{_javadir}/%{name}.jar
 install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
+
 # Desktop file and icon
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
-install -D -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications installer-%{major}-%{minor}/OS/Linux/%{name}.desktop
+install -D -p -m 644 installer-%{major}-%{minor}/OS/Linux/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 # Man page
-install -D -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1/%{name}.1
+install -D -p -m 644 installer-%{major}-%{minor}/OS/Linux/man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 # Javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -128,6 +126,12 @@ rm -rf %{buildroot}
 %{_datadir}/texmf/tex/latex/axodraw4j/
 
 %changelog
+* Wed Jun 09 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-7
+- Respect command line arguments in shell wrapper.
+
+* Mon May 31 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-6
+- Switch to using official installer tarball instead of files grabbed from svn.
+
 * Sat May 29 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 2.0.1-5
 - Added man page and desktop icon.