rpms/inkscape/devel inkscape-0.45.1-desktop.patch, NONE, 1.1 inkscape.spec, 1.38, 1.39

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.45.1-desktop.patch 
Log Message:
Rawhide did not love me last time... let's tidy up the .desktop file a bit.


inkscape-0.45.1-desktop.patch:

--- NEW FILE inkscape-0.45.1-desktop.patch ---
Make desktop-file-validate and rpmlint happy, handle compressed svgs (#245413)
and let it conform enough not to break the build in Rawhide.
(Lubomir Kundrak <lkundrak at redhat.com>)

--- inkscape-0.45.1.orig/inkscape.desktop.in	2007-01-16 03:49:00.000000000 +0100
+++ inkscape-0.45.1/inkscape.desktop.in	2007-12-02 03:17:08.000000000 +0100
@@ -2,18 +2,16 @@
 _Name=Inkscape SVG Vector Illustrator
 _Comment=Create and edit Scalable Vector Graphics images
 
-Encoding=UTF-8
 Version=1.0
 
 Type=Application
-Categories=Application;Graphics;VectorGraphics;GTK;
+Categories=Graphics;VectorGraphics;GTK;
 
-MimeType=image/svg+xml
+MimeType=image/svg+xml;image/svg+xml-compressed;
 
-FilePattern=inkscape
 Exec=inkscape %F
 TryExec=inkscape
 Terminal=false
 StartupNotify=true
 
-Icon=inkscape.png
+Icon=inkscape


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- inkscape.spec	2 Dec 2007 01:47:34 -0000	1.38
+++ inkscape.spec	2 Dec 2007 02:57:34 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           inkscape
 Version:        0.45.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -12,6 +12,7 @@
 Patch0:         inkscape-0.44.1-psinput.patch
 Patch1:         inkscape-0.45-python.patch
 Patch2:         inkscape-0.45.1-gtkprint.patch
+Patch3:         inkscape-0.45.1-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -69,6 +70,7 @@
 %patch0 -p1 -b .psinput
 %patch1 -p1 -b .python
 %patch2 -p0 -b .gtkprint
+%patch3 -p1 -b .desktop
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix share/extensions/*.py
@@ -103,8 +105,6 @@
 
 desktop-file-install --vendor fedora --delete-original     \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  --add-category X-Fedora                                  \
-  --add-mime-type image/svg+xml-compressed                 \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
 
 
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Sun Dec 02 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-3
+- Satisfy desktop-file-validate, so that Rawhide build won't break
+
 * Sat Dec 01 2007 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1-2
 - Use GTK print dialog
 - Added compressed SVG association (#245413)