rpms/fltk/devel fltk-1.1.8-fluid_desktop.patch, NONE, 1.1 fltk.spec, 1.35, 1.36

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/fltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Modified Files:
	fltk.spec 
Added Files:
	fltk-1.1.8-fluid_desktop.patch 
Log Message:
fix .desktop issues


fltk-1.1.8-fluid_desktop.patch:

--- NEW FILE fltk-1.1.8-fluid_desktop.patch ---
diff -up fltk-1.1.8/fluid/fluid.desktop.dt fltk-1.1.8/fluid/fluid.desktop
--- fltk-1.1.8/fluid/fluid.desktop.dt	2008-03-16 07:07:41.000000000 -0500
+++ fltk-1.1.8/fluid/fluid.desktop	2008-03-29 17:07:49.000000000 -0500
@@ -2,9 +2,9 @@
 Name=FLUID
 Comment=FLTK GUI Designer
 TryExec=fluid
-Exec=cd %D && fluid %F
+Exec=fluid %F
 Icon=fluid
 Terminal=false
 Type=Application
-MimeType=application/x-fluid
+MimeType=application/x-fluid;
 Categories=Development;GUIDesigner;


Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fltk.spec	29 Mar 2008 21:57:33 -0000	1.35
+++ fltk.spec	29 Mar 2008 22:11:00 -0000	1.36
@@ -25,6 +25,7 @@
 Patch3: 	fltk-1.1.x-r5750-undefined.patch
 # nuke --rpath (#238284)
 Patch4: 	fltk-1.1.x-r5750-rpath.patch
+Patch5: 	fltk-1.1.8-fluid_desktop.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -81,6 +82,7 @@
 %patch2 -p1 -b .test
 %patch3 -p1 -b .undefined
 %patch4 -p1 -b .rpath
+%patch5 -p1 -b .fluid_desktop
 
 
 %build
@@ -115,14 +117,18 @@
 
 make install install-desktop DESTDIR=$RPM_BUILD_ROOT 
 
+# omit examples/games: 
+make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
+rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
+
 # Makefile hack for 64bitness
 %if "%{_lib}" != "lib"
 rm -f  $RPM_BUILD_ROOT%{_libdir}/../lib
 %endif
 
-desktop-file-install --vendor="" \
+desktop-file-install --vendor="%{name}" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+    $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
 
 # docs
 rm -rf __docs
@@ -135,9 +141,6 @@
 %if "%{?_disable_static:1}" == "1"
 rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.a
 %endif
-# omit examples/games: 
-make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{blocks,checkers,sudoku}*
 
 
 %check