rpms/magic/devel magic.desktop,1.2,1.3 magic.spec,1.2,1.3

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/magic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13390/devel

Modified Files:
	magic.desktop magic.spec 
Log Message:



Index: magic.desktop
===================================================================
RCS file: /cvs/extras/rpms/magic/devel/magic.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magic.desktop	24 Apr 2007 09:10:56 -0000	1.2
+++ magic.desktop	21 Jun 2007 15:22:43 -0000	1.3
@@ -2,7 +2,7 @@
 Categories=Qt;KDE;Education;Science;Engineering;
 Comment=VLSI layout tool
 Encoding=UTF-8
-Exec=magic -d OGL
+Exec=magic
 GenericName=Magic
 Icon=gnome-util.png
 MimeType=application/mag


Index: magic.spec
===================================================================
RCS file: /cvs/extras/rpms/magic/devel/magic.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- magic.spec	24 Apr 2007 09:10:56 -0000	1.2
+++ magic.spec	21 Jun 2007 15:22:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:             magic
 Version:          7.4.35
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          A very capable VLSI layout tool
 
 License:          GPL
@@ -33,7 +33,7 @@
 %package doc
 Summary:           Documentation for magic, A very capable VLSI layout tool
 Group:             Documentation
-Requires:          %{name} = %{version}
+Requires:          %{name} = %{version}-%{release}
 
 
 %description doc
@@ -83,7 +83,8 @@
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
 
-desktop-file-install --vendor ""                \
+desktop-file-install --vendor fedora            \
+    --add-category X-Fedora                     \
     --add-category "Engineering"                \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
@@ -96,6 +97,8 @@
 %{__cp} -pr %{buildroot}%{_libdir}/%{name}/{doc/,tutorial} ..
 %{__rm} -rf %{buildroot}%{_libdir}/%{name}/{doc/,tutorial}
 
+%{__rm} -f doc/html/Makefile
+
 chmod -x %{buildroot}%{_libdir}/%{name}/tcl/console.tcl
 
 %post
@@ -115,7 +118,7 @@
 %{_bindir}/spice2sim
 %{_libdir}/%{name}/
 %{_mandir}/man?/*
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 
 %files doc
 %doc doc/ tutorial/
@@ -123,6 +126,9 @@
 
 
 %Changelog
+* Thu Jun 21 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-2
+- fix desktop file #241443
+
 * Wed Feb 22 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-1
 - New upstream release
 - added mimetype