rpms/kdiff3/devel kdiff3.spec,1.5,1.6

Neal Becker (nbecker) fedora-extras-commits at redhat.com
Wed Nov 7 18:10:53 UTC 2007


Author: nbecker

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

Modified Files:
	kdiff3.spec 
Log Message:
update desktop-file-install per Rex


Index: kdiff3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdiff3/devel/kdiff3.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdiff3.spec	7 Nov 2007 15:12:39 -0000	1.5
+++ kdiff3.spec	7 Nov 2007 18:10:16 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           kdiff3
 Version:        0.9.92
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary:        Compare + merge 2 or 3 files or directories
 
 Group:          Development/Tools
@@ -72,10 +72,12 @@
     --delete-original \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Development/kdiff3.desktop
 
-desktop-file-install  --vendor fedora \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden \
-	--delete-original \
-	$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
+echo "NoDisplay=true" >> \
+$RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
+desktop-file-install  --vendor="" \
+     --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+     --delete-original \
+     $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/kdiff3plugin.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,9 +100,11 @@
 %{_datadir}/icons/*/*/*/kdiff3.png
 %{_datadir}/services/*
 %{_mandir}/man1/kdiff3*
-%{_datadir}/applnk/.hidden/fedora-kdiff3plugin.desktop
 
 %changelog
+* Wed Nov  7 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.92-10
+- Update desktop-file-install as suggest by Rex
+
 * Wed Nov  7 2007 Neal Becker <ndbecker2 at gmail.com> - 0.9.92-8
 - Use desktop-file-install for kdiff3plugin.desktop
 




More information about the fedora-extras-commits mailing list