Hello community, here is the log from the commit of package update-desktop-files for openSUSE:Factory checked in at 2011-12-20 14:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old) and /work/SRC/openSUSE:Factory/.update-desktop-files.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "update-desktop-files", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes 2011-12-14 14:35:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes 2011-12-20 14:28:10.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Dec 16 10:20:44 UTC 2011 - [email protected] + +- give warning for old options instead of error + +------------------------------------------------------------------- +Fri Dec 16 09:49:24 UTC 2011 - [email protected] + +- use sed with inline option to avoid leaving temporary files behind + +------------------------------------------------------------------- +Thu Dec 15 12:44:49 UTC 2011 - [email protected] + +- desktop.attr should be reenabled in rpm again + +------------------------------------------------------------------- Old: ---- desktop.attr mimetypes.prov ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.jNOqOF/_old 2011-12-20 14:28:11.000000000 +0100 +++ /var/tmp/diff_new_pack.jNOqOF/_new 2011-12-20 14:28:11.000000000 +0100 @@ -26,9 +26,7 @@ Source: suse_update_desktop_file.sh Source1: map-desktop-category.sh Source2: macro -Source3: desktop.attr Source4: brp-trim-desktop.sh -Source100: mimetypes.prov # This is not true technically, but we do that to make the rpm macros from # desktop-file-utils available to most packages that ship a .desktop file # (since they already have a update-desktop-files BuildRequires). @@ -54,9 +52,8 @@ %install mkdir -p $RPM_BUILD_ROOT%_rpmconfigdir -install -m0755 %SOURCE0 %SOURCE1 %SOURCE100 $RPM_BUILD_ROOT%_rpmconfigdir +install -m0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT%_rpmconfigdir install -m0644 -D %SOURCE2 $RPM_BUILD_ROOT/etc/rpm/macros.%name -install -m0644 -D %SOURCE3 $RPM_BUILD_ROOT%_rpmconfigdir/fileattrs/desktop.attr install -m0755 -D %SOURCE4 $RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-desktopfiles %files ++++++ suse_update_desktop_file.sh ++++++ --- /var/tmp/diff_new_pack.jNOqOF/_old 2011-12-20 14:28:11.000000000 +0100 +++ /var/tmp/diff_new_pack.jNOqOF/_new 2011-12-20 14:28:11.000000000 +0100 @@ -121,7 +121,17 @@ GNAME="${1}" shift continue;; - *) + --basedir) + echo "WARNING: basedir is no longer supported" + shift + shift + continue;; + --project) + echo "WARNING: project is no longer supported" + shift + shift + continue;; + *) echo "UNKNOWN OPTION: $1" usage 1 ;; esac @@ -275,26 +285,24 @@ echo "" >> "${FILE}" CAT="${CAT#;}" if grep -q ^Categories= $FILE; then - sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Categories=.*,Categories='${CAT}',' "$FILE" > "${FILE}.new" && - mv "${FILE}.new" "${FILE}" + sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Categories=.*,Categories='${CAT}',' "$FILE" else if [ -n "${CAT%;}" ]; then - sed -e '/^\[Desktop Entry\]/a \ -'"Categories=${CAT%;};" $FILE > ${FILE}_ && mv ${FILE}_ $FILE + sed -i -e '/^\[Desktop Entry\]/a \ +'"Categories=${CAT%;};" $FILE fi fi if [ "$UNIMPORTANT" = "yes" ]; then if grep -q ^NoDisplay= $FILE; then - sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^NoDisplay=.*,NoDisplay=true,' "$FILE" > "${FILE}.new" && - mv "${FILE}.new" "${FILE}" + sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^NoDisplay=.*,NoDisplay=true,' "$FILE" else - sed -e '/^\[Desktop Entry\]/a \ -NoDisplay=true' $FILE > ${FILE}_ && mv ${FILE}_ $FILE + sed -i -e '/^\[Desktop Entry\]/a \ +NoDisplay=true' $FILE fi fi if [ "$DOCID" ]; then - sed -e '/^\[Desktop Entry\]/a \ -'"X-SuSE-DocTeamID=$DOCID" $FILE > ${FILE}_ && mv ${FILE}_ $FILE + sed -i -e '/^\[Desktop Entry\]/a \ +'"X-SuSE-DocTeamID=$DOCID" $FILE fi # @@ -324,8 +332,8 @@ mv "${FILE}.new" "${FILE}" fi else - sed -e '/^\[Desktop Entry\]/a \ -'"DocPath=${DOCPATH}" $FILE > ${FILE}.new && mv ${FILE}.new $FILE + sed -i -e '/^\[Desktop Entry\]/a \ +'"DocPath=${DOCPATH}" $FILE if $DOCPATH_IS_GUESS ; then echo NOTE: suse_update_desktop_file: Guessing DocPath=$DOCPATH in $FILE fi @@ -338,41 +346,41 @@ fi if [ "$NAME" != "no" ]; then - grep -v '^Name\[' $FILE > ${FILE}_ + sed -i -e '/^Name\[/d' $FILE if [ -n "$NAME" ]; then - if ! grep -q ^Name= ${FILE}_; then - sed -e '/^\[Desktop Entry\]/a '"Name=${NAME//,/\,}" ${FILE}_ > $FILE + if ! grep -q ^Name= ${FILE}; then + sed -i -e '/^\[Desktop Entry\]/a '"Name=${NAME//,/\,}" ${FILE} else - sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Name=.*,Name='"${NAME//,/\,}"',' ${FILE}_ > $FILE + sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Name=.*,Name='"${NAME//,/\,}"',' ${FILE} fi else - grep -v "^Name=" ${FILE}_ > $FILE + sed -i -e '/^Name=/d' $FILE fi fi if [ "$GNAME" != "no" ]; then - grep -v '^GenericName\[' $FILE > ${FILE}_ + sed -i -e '/^GenericName\[/d' $FILE if [ -n "$GNAME" ]; then if ! grep -q ^GenericName= ${FILE}_; then - sed -e '/^\[Desktop Entry\]/a '"GenericName=${GNAME//,/\,}" ${FILE}_ > $FILE + sed -i -e '/^\[Desktop Entry\]/a '"GenericName=${GNAME//,/\,}" ${FILE} else - sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^GenericName=.*,GenericName='"${GNAME//,/\,}"',' ${FILE}_ > $FILE + sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^GenericName=.*,GenericName='"${GNAME//,/\,}"',' ${FILE} fi else - grep -v "^GenericName=" ${FILE}_ > $FILE + sed -i -e '/^GenericName=/d' $FILE fi fi if [ "$COMMENT" != "no" ]; then - grep -v '^Comment\[' $FILE > ${FILE}_ + sed -i -e '/^Comment\[/d' $FILE if [ -n "$COMMENT" ]; then - if ! grep -q ^Comment= ${FILE}_; then - sed -e '/^\[Desktop Entry\]/a '"Comment=${COMMENT//,/\,}" ${FILE}_ > $FILE + if ! grep -q ^Comment= ${FILE}; then + sed -i -e '/^\[Desktop Entry\]/a '"Comment=${COMMENT//,/\,}" ${FILE} else - sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Comment=.*,Comment='"${COMMENT//,/\,}"',' ${FILE}_ > $FILE - fi + sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Comment=.*,Comment='"${COMMENT//,/\,}"',' ${FILE} + fi else - grep -v "^Comment=" ${FILE}_ > $FILE + sed -i -e '/^Comment=/d' $FILE fi fi @@ -380,6 +388,6 @@ # # this file will not get translated # - sed -e '/^\[Desktop Entry\]/a \ -X-SuSE-translate=false' $FILE > ${FILE}_ && mv ${FILE}_ $FILE + sed -i -e '/^\[Desktop Entry\]/a \ +X-SuSE-translate=false' $FILE fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
