packages: astah/astah.spec - be consistent with macros -- use them

[glen]

Author: glen                         Date: Fri Nov  5 12:17:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- be consistent with macros -- use them

---- Files affected:
packages/astah:
   astah.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/astah/astah.spec
diff -u packages/astah/astah.spec:1.24 packages/astah/astah.spec:1.25
--- packages/astah/astah.spec:1.24	Fri Nov  5 13:16:26 2010
+++ packages/astah/astah.spec	Fri Nov  5 13:17:37 2010
@@ -72,7 +72,7 @@
 
 cat <<'EOF' > %{name}.sh
 #!/bin/sh
-exec java -Xms16m -Xmx512m -Xss2m -jar %{_datadir}/%{name}/astah-%{codename}.jar ${1:+"$@"}
+exec java -Xms16m -Xmx512m -Xss2m -jar %{_datadir}/%{name}/%{name}-%{codename}.jar ${1:+"$@"}
 EOF
 
 %install
@@ -80,14 +80,14 @@
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
 
 install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
-cp -a astah-%{codename}.jar $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a %{name}-%{codename}.jar $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a *.asta $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/mime/packages,%{_pixmapsdir}}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages/astah.xml
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{name}.xml
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 # javadoc
@@ -119,7 +119,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}-%{codename}.jar
 %{_desktopdir}/%{name}.desktop
-%{_datadir}/mime/packages/astah.xml
+%{_datadir}/mime/packages/%{name}.xml
 %{_pixmapsdir}/%{name}.png
 
 %dir %{_examplesdir}/%{name}-%{version}
@@ -140,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/11/05 12:17:37  glen
+- be consistent with macros -- use them
+
 Revision 1.24  2010/11/05 12:16:26  glen
 - project got renamed to astash, update to 6.2.1
 - drop legacy mimelnk, add mime.xml instead
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/astah/astah.spec?r1=1.24&r2=1.25&f=u