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

suse_update_desktop_file.sh

@@ -149,6 +149,9 @@ for i in $FILE_; do
   #
   sed -e 's/\[KDE Desktop Entry\]/[Desktop Entry]/' "$i" > "${i}_" && mv "${i}_" "$i"
 
+  # dos2unix for the poor
+  sed -e 's/
//' "$i" > "${i}_" && mv "${i}_" "$i"
+
   if [ "$FILE" ]; then
     echo ERROR: suse_update_desktop_file: $APPLICATION has multiple desktop files
     exit 1
@@ -267,6 +270,11 @@ if [ -n "$DOCPATH" ] ; then
   fi
 fi
 
+if grep -q ^X-SuSE-translate= $FILE; then
+   echo "ERROR: $FILE contains X-SuSE-translate - called the macro twice?"
+   exit 1
+fi
+
 if [ "$I18N" = "yes" ]; then
 
   if [ "$NAME" != "no" ]; then
@@ -365,4 +373,3 @@ if [ "$EXEC" != "$_EXEC" ]; then
     mv "${FILE}.new" "${FILE}" 
 fi
 
-/usr/bin/desktop-file-validate "${FILE}" || true

update-desktop-files.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue May 15 10:57:30 CEST 2007 - coolo@suse.de
+
+- remove windows line feeds from desktop files
+
+-------------------------------------------------------------------
+Mon May 14 11:41:57 CEST 2007 - coolo@suse.de
+
+- remove the desktop-file-validate call again to avoid loops in
+  dependency chains
+- make sure X-SuSE-Translate isn't already part of the file
+
 -------------------------------------------------------------------
 Fri May 11 12:06:29 CEST 2007 - coolo@suse.de
 

update-desktop-files.spec

@@ -12,7 +12,7 @@
 
 Name:           update-desktop-files
 Version:        10.3
-Release:        18
+Release:        20
 Summary:        A Build Tool to Update Desktop Files
 License:        GNU General Public License (GPL)
 Group:          Development/Tools/Building
@@ -123,6 +123,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/locale/*/LC_MESSAGES/*mo
 
 %changelog
+* Tue May 15 2007 - coolo@suse.de
+- remove windows line feeds from desktop files
+* Mon May 14 2007 - coolo@suse.de
+- remove the desktop-file-validate call again to avoid loops in
+  dependency chains
+- make sure X-SuSE-Translate isn't already part of the file
 * Fri May 11 2007 - coolo@suse.de
 - add X-SuSE-YaST2-Virtualization (#258600)
 * Mon May 07 2007 - coolo@suse.de