Author: eandry
Date: Sat Dec  2 19:08:27 2006
New Revision: 90099

Removed:
   packages/cooker/poedit/current/SOURCES/poedit-1.3.3-no-desktop.patch.bz2
Modified:
   packages/cooker/poedit/current/SPECS/poedit.spec

Log:
Drop patch0
xdg menu

Modified: packages/cooker/poedit/current/SPECS/poedit.spec
==============================================================================
--- packages/cooker/poedit/current/SPECS/poedit.spec    (original)
+++ packages/cooker/poedit/current/SPECS/poedit.spec    Sat Dec  2 19:08:27 2006
@@ -1,6 +1,6 @@
 %define        name    poedit
 %define        version 1.3.4
-%define release        %mkrel 2
+%define release        %mkrel 3
 
 %define        section More Applications/Editors
 %define        title   Poedit
@@ -16,7 +16,7 @@
 URL:           http://www.poedit.org
 Source0:       %{name}-%{version}.tar.bz2
 # (Abel) 1.3.3-1mdk Avoid detection of desktop stuff
-Patch0:                poedit-1.3.3-no-desktop.patch.bz2
+#Patch0:               poedit-1.3.3-no-desktop.patch.bz2
 BuildRoot:      %_tmppath/%{name}-%{version}-buildroot
 Requires:      gettext
 BuildRequires: wxgtku-devel >= 2.6
@@ -25,6 +25,9 @@
 BuildRequires: zip
 BuildRequires: desktop-file-utils
 BuildRequires: automake1.9
+Requires(Pre): shared-mime-info
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
 poEdit is cross-platform gettext catalogs (.po files) editor. It is built with
@@ -36,10 +39,10 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-desktop
+#%patch0 -p1 -b .no-desktop
 
 # needed by patch
-autoconf
+# autoconf
 
 %build
 # wx-config is brain-damaged. Damn you, multiarch, damn you
@@ -62,22 +65,21 @@
 
mimetypes="application/x-po,application/x-gettext,application/x-gettext-translation,text/x-gettext-translation,text/x-gettext-translation-template"
 \
 accept_url="true" \
 multiple_files="true" \
-longtitle="%Summary"
+longtitle="%Summary" \
+xdg="true"
 EOF
 
+desktop-file-install --vendor="" \
+  --remove-category="Application" \
+  --add-category="GNOME" \
+  --add-category="X-MandrivaLinux-MoreApplications-Editors;TextEditor" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications 
$RPM_BUILD_ROOT%{_datadir}/applications/*
+
 # icons
 %__install -D -m 644 src/icons/appicon/poedit-48.png 
%buildroot/%_liconsdir/%name.png
 %__install -D -m 644 src/icons/appicon/poedit-32.png 
%buildroot/%_iconsdir/%name.png
 %__install -D -m 644 src/icons/appicon/poedit-16.png 
%buildroot/%_miconsdir/%name.png
 
-# install desktop stuff manually
-%__install -D -m 644 install/x-po.desktop 
%{buildroot}%{_datadir}/mimelnk/application/x-po.desktop
-%__install -D -m 644 install/poedit.desktop 
%{buildroot}%{_datadir}/applnk/Development/poedit.desktop
-%__install -D -m 644 src/icons/appicon/poedit-48.png 
%{buildroot}%{_datadir}/pixmaps/poedit.png
-
-# and gnome desktop entry too
-%__mkdir_p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor='' 
--add-mime-type='application/x-gettext-translation;text/x-gettext-translation;text/x-gettext-translation-template'
 --add-category='GNOME;Application;Development' 
--dir='%{buildroot}%{_datadir}/applications' install/poedit.desktop
 
 # remove files not bundled
 %__rm -f %{buildroot}/%{_iconsdir}/poedit.xpm
@@ -96,9 +98,11 @@
 
 %post
 %update_menus
+%update_desktop_database
 
 %postun
 %clean_menus
+%clean_desktop_database
 
 %clean
 %__rm -rf %{buildroot}
@@ -122,4 +126,4 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/pixmaps/*
 #{_datadir}/gnome/apps/Development/*
-#{_datadir}/mime-info/poedit.*
+%{_datadir}/mime-info/poedit.*

Reply via email to