OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/update-desktop-files?expand=0&rev=12

map-desktop-category-pre-10.1.diff

@@ -1,22 +0,0 @@
---- map-desktop-category.sh	2006/02/27 10:53:00	1.1
-+++ map-desktop-category.sh	2006/02/27 10:53:38
-@@ -71,10 +71,6 @@
-        ret="Player"
-        echo WARNING: AudioVideoPlayer is an illegal Category, mapping it to Player
-        ;;
--    Photograph)
--       ret="Photography"
--       echo WARNING: Photograph is a mistyped Category, mapping it to Photography
--       ;;
- #Office Menu:
-     Calendar|WordProcessor|Spreadsheet|ProjectManagement|Presentation| \
-     Database|Dictionary|Finance|FlowChart|ContactManagement|PDFViewer) ret=$in ;;
-@@ -89,7 +85,7 @@
-     Design)
-        ret="X-SuSE-$in";;
- #Graphics Menu:
--    3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics) ret=$in ;;
-+    3DGraphics|Photograph|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics) ret=$in ;;
- #Education Menu:
-     Teaching|Science|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-     Engineering) ret=$in ;;

map-desktop-category.sh

@@ -1,3 +1,4 @@
+#! /bin/sh
 
 function mapCategory() {
   ret=""

suse_update_desktop_file.sh

@@ -1,3 +1,5 @@
+#! /bin/sh
+
 # macro: suse_update_desktop_file
 #
 #     Used to add easily a category to .desktop files according to XDG

update-desktop-files.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 29 12:18:07 CEST 2007 - coolo@suse.de
+
+- fix rpmlint problems
+
+-------------------------------------------------------------------
+Mon May 28 12:29:30 CEST 2007 - coolo@suse.de
+
+- remove the requires for desktop-file-validate too
+
 -------------------------------------------------------------------
 Mon May 21 17:48:09 CEST 2007 - coolo@suse.de
 

update-desktop-files.spec

@@ -12,13 +12,12 @@
 
 Name:           update-desktop-files
 Version:        10.3
-Release:        22
+Release:        25
 Summary:        A Build Tool to Update Desktop Files
 License:        GNU General Public License (GPL)
 Group:          Development/Tools/Building
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       desktop-translations = %{version}
-Requires:       desktop-file-utils
 Autoreqprov:    on
 Source:         suse_update_desktop_file.sh
 Source1:        map-desktop-category.sh
@@ -32,7 +31,6 @@ Source6:        packages-3D
 Source7:        kappfinder-icons.tar.bz2
 Source10:       desktop-translations.tar.bz2
 Source99:       PREPARE_PACKAGE
-Patch:          map-desktop-category-pre-10.1.diff
 BuildArchitectures: noarch
 
 %description
@@ -63,8 +61,10 @@ Authors:
 mkdir %name
 cd %name
 
+%build
+
 %install
-cd %name
+pushd %name
 tar xfj %SOURCE10
 cd po
 for lang in *; do 
@@ -83,7 +83,8 @@ for lang in *; do
     done
   fi
 done
-install -m 0644 %SOURCE5 %SOURCE6 %SOURCE3 %SOURCE4 $RPM_BUILD_ROOT/usr/share/%name/
+install -m 0644 %SOURCE5 %SOURCE6 %SOURCE3 $RPM_BUILD_ROOT/usr/share/%name/
+install -m 755 %SOURCE4 $RPM_BUILD_ROOT/usr/share/%name/
 mkdir -p $RPM_BUILD_ROOT/usr/share/%name/templates
 tar xfj %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%name/templates
 tar xfj %SOURCE7 -C $RPM_BUILD_ROOT/usr/share/%name/
@@ -93,16 +94,18 @@ install -m 0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/rpm
 cd $RPM_BUILD_ROOT/usr/lib/rpm
 patch -p0 <%PATCH0
 %endif
+popd
+%find_lang desktop_translations
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/share/%name
+%lang(en) /usr/share/%name
 /usr/lib/rpm/*
 
-%files -n desktop-translations
+%files -f desktop_translations.lang -n desktop-translations
 %defattr(-,root,root)
 %if %suse_version <= 1000
 %dir /usr/share/locale/km
@@ -120,9 +123,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/locale/tt
 %dir /usr/share/locale/tt/LC_MESSAGES
 %endif
-/usr/share/locale/*/LC_MESSAGES/*mo
 
 %changelog
+* Tue May 29 2007 - coolo@suse.de
+- fix rpmlint problems
+* Mon May 28 2007 - coolo@suse.de
+- remove the requires for desktop-file-validate too
 * Mon May 21 2007 - coolo@suse.de
 - update from SVN to fix a lot of bugs ;(
 * Tue May 15 2007 - coolo@suse.de