rpms/jmol/F-10 jmol.spec,1.6,1.7 jmol.desktop,1.2,NONE

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/jmol/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3745/F-10

Modified Files:
	jmol.spec 
Removed Files:
	jmol.desktop 
Log Message:
Include desktop file in spec.


Index: jmol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jmol/F-10/jmol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jmol.spec	16 Jul 2009 16:37:20 -0000	1.6
+++ jmol.spec	16 Jul 2009 21:02:18 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		jmol
 Version:	11.6
-Release:	10.%{svnrel}svn%{?dist}
+Release:	11.%{svnrel}svn%{?dist}
 Summary:	An open-source Java viewer for chemical structures in 3D
 Group:		Applications/Engineering
 License:	LGPLv2+
@@ -15,7 +15,6 @@ BuildArch:	noarch
 # The source package has been created from SVN sources:
 # svn export -r %{svnrel} https://jmol.svn.sourceforge.net/svnroot/jmol/branches/v11_6/Jmol
 Source0:	%{name}-%{version}.%{svnrel}.tar.bz2
-Source1:	jmol.desktop
 # Image available at "http://wiki.jmol.org:81/index.php/Image:Jmol_icon_128.png"
 Source2:	Jmol_icon_128.png
 # Patch disabling jar signing
@@ -60,27 +59,35 @@ The documentation for %{name}.
 %patch0 -p1
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 
+# Remove executable permissions from documentation
+chmod 644 README.txt
+chmod 644 COPYRIGHT.txt
+
+# Make desktop file
+cat > jmol.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Jmol
+Comment=An open-source Java viewer for chemical structures in 3D
+Exec=jmol
+Icon=jmol
+Terminal=false
+Type=Application
+Categories=Education;Science;
+EOF
+
 %build
 ant doc main
 
 %install
 rm -rf %{buildroot}
-
 install -D -p -m 755 jmol %{buildroot}%{_bindir}/%{name}
-
-install -D -p -m 444 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
-install -D -p -m 444 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
-
-install -D -p -m 444 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
-
-# Convert documentation to UTF-8
-for txtfile in README.txt COPYRIGHT.txt LICENSE.txt; do
-	iconv -f ASCII -t UTF-8 $txtfile >$txtfile.new && mv $txtfile{.new,}
-done
+install -D -p -m 644 build/JmolUnsigned.jar %{buildroot}%{_datadir}/%{name}/Jmol.jar
+install -D -p -m 644 build/JmolApplet.jar %{buildroot}%{_datadir}/%{name}/JmolApplet.jar
+install -D -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 # Install desktop file
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- --vendor=fedora %{SOURCE1}
+desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=fedora jmol.desktop
 
 # Javadoc files
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -93,19 +100,22 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc build/doc/* README.txt COPYRIGHT.txt LICENSE.txt
 %{_bindir}/%{name}
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
 
 %files doc
 %defattr(-,root,root,-)
 %doc build/doc/*
 
 %changelog
+* Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.6-11.11223svn
+- Include desktop file in the spec.
+
 * Thu Jul 16 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 11.6-10.11223svn
 - Bump release to be able to rebuild in koji.
 


--- jmol.desktop DELETED ---