rpms/dia/devel dia-0.96.1-desktop.patch, NONE, 1.1 dia.spec, 1.23, 1.24

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	dia.spec 
Added Files:
	dia-0.96.1-desktop.patch 
Log Message:
* Sun Dec  2 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96.1-5
- Do not put dia in both the Office and the Graphics application menus
  (bz 408041)


dia-0.96.1-desktop.patch:

--- NEW FILE dia-0.96.1-desktop.patch ---
diff -up dia-0.96.1/dia.desktop.in.in~ dia-0.96.1/dia.desktop.in.in
--- dia-0.96.1/dia.desktop.in.in~	2007-12-02 22:30:13.000000000 +0100
+++ dia-0.96.1/dia.desktop.in.in	2007-12-02 22:30:13.000000000 +0100
@@ -4,7 +4,7 @@ _Name=Dia Diagram Editor
 _Comment=Edit your Diagrams
 Type=Application
 Exec=dia
-Icon=dia_gnome_icon.png
+Icon=dia_gnome_icon
 Terminal=false
 Categories=GNOME;Application;Graphics;
 StartupNotify=true


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dia.spec	2 Dec 2007 21:11:24 -0000	1.23
+++ dia.spec	2 Dec 2007 21:30:48 -0000	1.24
@@ -12,6 +12,7 @@
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 Patch4:         dia-0.96-python-detect.patch
 Patch5:         dia-0.96.1-64bit.patch
+Patch6:         dia-0.96.1-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -34,6 +35,7 @@
 %patch3 -p1 -b .fallbacktoxpmicons
 %patch4 -p1 -b .py-detect
 %patch5 -p1 -b .64bit
+%patch6 -p1
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`
@@ -101,7 +103,6 @@
 %dir %{_datadir}/gnome
 %dir %{_datadir}/gnome/help
 %{_datadir}/gnome/help/%{name}
-%dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
 %{_datadir}/icons/hicolor/48x48/apps/*.png