commit update-desktop-files for openSUSE:Factory

2020-07-17 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2020-07-17 20:44:00

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new.3592 (New)


Package is "update-desktop-files"

Fri Jul 17 20:44:00 2020 rev:103 rq:821230 version:84.87

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2019-09-19 15:50:30.091297458 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new.3592/update-desktop-files.changes
  2020-07-17 20:44:08.352494420 +0200
@@ -1,0 +2,5 @@
+Tue Jun 30 03:21:06 UTC 2020 - Stanislav Brabec 
+
+- Remove GNOME 1 and KDE 3 support (boo#1062631, rpmlint#437).
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.q4CqC0/_old  2020-07-17 20:44:09.524495669 +0200
+++ /var/tmp/diff_new_pack.q4CqC0/_new  2020-07-17 20:44:09.528495673 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ brp-trim-translations.sh ++
--- /var/tmp/diff_new_pack.q4CqC0/_old  2020-07-17 20:44:09.588495737 +0200
+++ /var/tmp/diff_new_pack.q4CqC0/_new  2020-07-17 20:44:09.588495737 +0200
@@ -104,12 +104,8 @@
 done
 
 # Handle desktop files
-find "/$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/" \
-  "/$RPM_BUILD_ROOT/opt/kde3/share/applnk/" \
-  "/$RPM_BUILD_ROOT/usr/share/xsessions/" \
+find "/$RPM_BUILD_ROOT/usr/share/xsessions/" \
   "/$RPM_BUILD_ROOT/usr/share/applications/" \
-  "/$RPM_BUILD_ROOT/usr/share/mimelnk/" \
-  "/$RPM_BUILD_ROOT/usr/share/gnome/apps/" \
   "/$RPM_BUILD_ROOT/usr/share/autostart/" \
   "/$RPM_BUILD_ROOT/etc/xdg/autostart/" \
   "/$RPM_BUILD_ROOT/usr/share/wallpapers/" \

++ suse_update_desktop_file.sh ++
--- /var/tmp/diff_new_pack.q4CqC0/_old  2020-07-17 20:44:09.616495767 +0200
+++ /var/tmp/diff_new_pack.q4CqC0/_new  2020-07-17 20:44:09.620495772 +0200
@@ -193,10 +193,7 @@
 #
 # find file
 #
-for i in /$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/ \
-  /$RPM_BUILD_ROOT/opt/kde3/share/applnk \
-  /$RPM_BUILD_ROOT/usr/share/applications/ \
-  /$RPM_BUILD_ROOT/usr/share/gnome/apps/ \
+for i in /$RPM_BUILD_ROOT/usr/share/applications/ \
   /$RPM_BUILD_ROOT/etc/xdg/autostart/ ; do
 [ -e "$i" ] && DIRS="$DIRS $i" 
 done 
@@ -227,22 +224,6 @@
 done
 
 #
-# move KDE legacy files to XDG path
-#
-if echo $FILE | grep -q /opt/kde3/share/applnk/ ; then
- if ! echo $FILE | grep -q /opt/kde3/share/applnk/.hidden/ ; then
-  if ! echo $FILE | grep -q /opt/kde3/share/applnk/Settings/ ; then
-   if ! echo $FILE | grep -q /opt/kde3/share/applnk/System/ScreenSavers/ ; then
- echo "WARNING: file is in old KDE legacy path, moving it to XDG path"
- mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/
- mv "$FILE" $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/
- FILE="$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/${FILE##*/}"
-   fi
-  fi
- fi
-fi
-
-#
 # validate file
 #
 if [ ! -r "$FILE" ]; then 
@@ -252,7 +233,7 @@
 # esp. for susehelp
 FILE_DOCPATH=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e 
's,^DocPath=\\(.*\\),\\1,p' ${FILE}` 
 if [ -n "$FILE_DOCPATH" ] ; then
-  if [ ! -r 
"$RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/$FILE_DOCPATH/index.docbook" ] && [ 
! -r "$RPM_BUILD_ROOT/usr/share/gnome/help/$FILE_DOCPATH/C/$FILE_DOCPATH.xml" ] 
&& [ ! -r $RPM_BUILD_ROOT/usr/share/gnome/help/${DOCPATH/\///C/} ] ; then 
+  if [ ! -r 
"$RPM_BUILD_ROOT/usr/share/gnome/help/$FILE_DOCPATH/C/$FILE_DOCPATH.xml" ] && [ 
! -r $RPM_BUILD_ROOT/usr/share/gnome/help/${DOCPATH/\///C/} ] ; then 
  echo WARNING: suse_update_desktop_file: DocPath target $FILE_DOCPATH for 
$FILE does not exist
   fi
 fi
@@ -264,12 +245,6 @@
   CATIN=`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,;, ,g' -e 
's,^Categories=\\(.*\\),\\1,p' ${FILE}` 
 fi
 CATIN="$CATIN ${CATEGORIES//;/ }"
-if [ -z "$CATIN" ]; then 
-  case "${FILE%/*}" in
-   */opt/kde3/*) CATIN="Qt KDE" ;;
-   */usr/share/gnome*) CATIN="GTK" ;;
-  esac
-fi
 unset CAT
 unset DCAT
 for i in $CATIN; do
@@ -314,10 +289,6 @@
 DOCPATH=$APPLICATION
 DOCPATH_IS_GUESS=true
   fi
-  if [ -f 
$RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/$APPLICATION/index.docbook ] ; then
-DOCPATH=$APPLICATION
-DOCPATH_IS_GUESS=true
-  fi
   # NOTE: Here we can add guess for application/file.xml
 fi
 if [ -n "$DOCPATH" ] ; then

commit update-desktop-files for openSUSE:Factory

2019-09-19 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2019-09-19 15:50:27

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new.7948 (New)


Package is "update-desktop-files"

Thu Sep 19 15:50:27 2019 rev:102 rq:730178 version:84.87

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2019-06-22 11:05:11.431915475 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new.7948/update-desktop-files.changes
  2019-09-19 15:50:30.091297458 +0200
@@ -1,0 +2,6 @@
+Tue Sep 10 16:06:41 UTC 2019 - Benjamin Greiner 
+
+- Add ComputerScience, sort Science and Education alphabetically
+  (boo#1074711)
+
+---



Other differences:
--
++ map-desktop-category.sh ++
--- /var/tmp/diff_new_pack.kQmLRx/_old  2019-09-19 15:50:30.599297355 +0200
+++ /var/tmp/diff_new_pack.kQmLRx/_new  2019-09-19 15:50:30.599297355 +0200
@@ -97,11 +97,11 @@
 
3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps|
 \
 Publishing|Viewer) ret=$in ;;
 #Education and Science Menu:
-Teaching|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-Engineering|Geography|Spirituality|Humanities|ArtificialIntelligence| \
-
DataVisualization|Economy|Electricity|Geology|Geoscience|History|ImageProcessing|
 \
-
Literature|MedicalSoftware|NumericalAnalysis|ParallelComputing|Physics|Robotics|
 \
-Sports|Biology) ret=$in ;;
+
Art|ArtificialIntelligence|Astronomy|Biology|Chemistry|ComputerScience|Construction|
 \
+
DataVisualization|Economy|Electricity|Engineering|Geography|Geology|Geoscience| 
\
+
History|Humanities|ImageProcessing|Languages|Literature|Maps|Math|MedicalSoftware|
 \
+
Music|NumericalAnalysis|ParallelComputing|Physics|Robotics|Spirituality|Sports| 
\
+Teaching) ret=$in ;;
 #Multimedia Menu:
 AudioVideoEditing|Music|DiscBurning|Mixer|Player|Midi|Sequencer| \
 TV|Tuner|Recorder|Video) ret=$in ;;

commit update-desktop-files for openSUSE:Factory

2019-06-22 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2019-06-22 11:05:10

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new.4615 (New)


Package is "update-desktop-files"

Sat Jun 22 11:05:10 2019 rev:101 rq:710688 version:84.87

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2018-06-25 11:33:43.192705909 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new.4615/update-desktop-files.changes
  2019-06-22 11:05:11.431915475 +0200
@@ -1,0 +2,5 @@
+Thu Jun  6 17:53:56 UTC 2019 - Dominique Leuenberger 
+
+- Move rpm macros to %_rpmmacrodir.
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.fTRCFp/_old  2019-06-22 11:05:11.979916391 +0200
+++ /var/tmp/diff_new_pack.fTRCFp/_new  2019-06-22 11:05:11.983916398 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -75,7 +75,7 @@
 %install
 mkdir -p $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 %SOURCE2 $RPM_BUILD_ROOT%_rpmmacrodir/macros.%name
 install -m0755 -D %SOURCE4 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-translations
 install -m0755 -D %name/brp-extract-translations 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-extract-translations
 
@@ -83,7 +83,7 @@
 %defattr(-,root,root)
 %_rpmconfigdir/*
 %exclude %_rpmconfigdir/brp-suse.d
-/etc/rpm/*
+%_rpmmacrodir/*
 
 %files -n brp-trim-translations
 %defattr(-,root,root)

commit update-desktop-files for openSUSE:Factory

2018-06-25 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2018-06-25 11:33:42

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is "update-desktop-files"

Mon Jun 25 11:33:42 2018 rev:100 rq:618221 version:84.87

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2018-03-16 10:34:44.627064343 +0100
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2018-06-25 11:33:43.192705909 +0200
@@ -1,0 +2,6 @@
+Wed Jun 20 12:21:36 UTC 2018 - fv...@suse.com
+
+- Update map-desktop-category.sh to include updated Education, Science
+  and Graphics categories (boo#1074711)
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.Pu1fIX/_old  2018-06-25 11:33:44.008675793 +0200
+++ /var/tmp/diff_new_pack.Pu1fIX/_new  2018-06-25 11:33:44.016675498 +0200
@@ -20,7 +20,7 @@
 Version:84.87
 Release:0
 Summary:A Build Tool to Update Desktop Files
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Development/Tools/Building
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Source: suse_update_desktop_file.sh

++ map-desktop-category.sh ++
--- /var/tmp/diff_new_pack.Pu1fIX/_old  2018-06-25 11:33:44.072673431 +0200
+++ /var/tmp/diff_new_pack.Pu1fIX/_new  2018-06-25 11:33:44.072673431 +0200
@@ -94,10 +94,14 @@
 Design)
ret="X-SuSE-$in";;
 #Graphics Menu:
-
3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps)
 ret=$in ;;
+
3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps|
 \
+Publishing|Viewer) ret=$in ;;
 #Education and Science Menu:
 Teaching|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-Engineering|Geography|Spirituality|Humanities) ret=$in ;;
+Engineering|Geography|Spirituality|Humanities|ArtificialIntelligence| \
+
DataVisualization|Economy|Electricity|Geology|Geoscience|History|ImageProcessing|
 \
+
Literature|MedicalSoftware|NumericalAnalysis|ParallelComputing|Physics|Robotics|
 \
+Sports|Biology) ret=$in ;;
 #Multimedia Menu:
 AudioVideoEditing|Music|DiscBurning|Mixer|Player|Midi|Sequencer| \
 TV|Tuner|Recorder|Video) ret=$in ;;
@@ -130,7 +134,7 @@
 Application|Qt|KDE|GTK|GNOME|XFCE|Motif|ConsoleOnly|Shell|X-Red-*| \
 X-Ximian-*|X-GNOME-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \
 Office|Network|Game|Graphics|Education|Documentation|Development| \
-Viewer|Science|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
+Science|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
 Core-Edutainment|Core-Game|Core-Graphics|Core-Internet| \
 Core-Multimedia|Core-Office|Core-Settings|Core-Utility|Core-System| \
 Core-Configuration|Core-Development|core)

commit update-desktop-files for openSUSE:Factory

2018-03-16 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2018-03-16 10:34:41

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is "update-desktop-files"

Fri Mar 16 10:34:41 2018 rev:99 rq:587473 version:84.87

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2017-07-30 11:24:19.755223925 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2018-03-16 10:34:44.627064343 +0100
@@ -1,0 +2,6 @@
+Thu Mar 15 10:53:08 UTC 2018 - lnus...@suse.de
+
+- create separate subpackage that extracts translations from desktop
+  files but does not actually strip them. Needed for SLE.
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.H9o9C2/_old  2018-03-16 10:34:46.051013072 +0100
+++ /var/tmp/diff_new_pack.H9o9C2/_new  2018-03-16 10:34:46.055012928 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   update-desktop-files
-Version:12.1
+Version:84.87
 Release:0
 Summary:A Build Tool to Update Desktop Files
 License:GPL-2.0+
@@ -44,15 +44,31 @@
 Obsoletes:  brp-trim-desktop < %{version}
 Requires:   awk
 Requires:   libxslt-tools
+Conflicts:  brp-extract-translations
 
 %description -n brp-trim-translations
-Trim translations from all desktop files, polkit actions, mimetype descriptions
+Extract and trim translations from all desktop files, polkit
+actions, mimetype descriptions and AppStream metainfo found in
+build root
+
+%package -n brp-extract-translations
+Summary:Extract translations from desktop files, polkit actions, 
mimetype descriptions and AppStream metainfo
+Group:  Development/Tools/Building
+Provides:   brp-trim-desktop = %{version}
+Obsoletes:  brp-trim-desktop < %{version}
+Requires:   libxslt-tools
+Conflicts:  brp-trim-translations
+
+%description -n brp-extract-translations
+Extract translations from all desktop files, polkit actions, mimetype 
descriptions
 and AppStream metainfo found in build root
 
 %prep
 %setup -q -n . -D -T 0
 mkdir %name
 cd %name
+# supi hack
+sed -e '/awk/d' < %SOURCE4 > brp-extract-translations
 
 %build
 
@@ -61,6 +77,7 @@
 install -m0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT%_rpmconfigdir
 install -m0644 -D %SOURCE2 $RPM_BUILD_ROOT/etc/rpm/macros.%name
 install -m0755 -D %SOURCE4 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-translations
+install -m0755 -D %name/brp-extract-translations 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-extract-translations
 
 %files
 %defattr(-,root,root)
@@ -73,4 +90,9 @@
 %dir %_rpmconfigdir/brp-suse.d/
 %_rpmconfigdir/brp-suse.d/brp-70-trim-translations
 
+%files -n brp-extract-translations
+%defattr(-,root,root)
+%dir %_rpmconfigdir/brp-suse.d/
+%_rpmconfigdir/brp-suse.d/brp-70-extract-translations
+
 %changelog

commit update-desktop-files for openSUSE:Factory

2017-07-30 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2017-07-30 11:24:18

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is "update-desktop-files"

Sun Jul 30 11:24:18 2017 rev:98 rq:510908 version:12.1

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2017-04-29 10:47:12.785723569 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2017-07-30 11:24:19.755223925 +0200
@@ -1,0 +2,6 @@
+Fri Jul 14 13:15:57 UTC 2017 - fv...@suse.com
+
+- Remove translations for Name,GenericName and Comment only in the
+  [Desktop Entry] section to avoid breaking desktop action translations
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.bt2lqL/_old  2017-07-30 11:24:20.395133628 +0200
+++ /var/tmp/diff_new_pack.bt2lqL/_new  2017-07-30 11:24:20.399133063 +0200
@@ -42,6 +42,7 @@
 Group:  Development/Tools/Building
 Provides:   brp-trim-desktop = %{version}
 Obsoletes:  brp-trim-desktop < %{version}
+Requires:   awk
 Requires:   libxslt-tools
 
 %description -n brp-trim-translations

++ brp-trim-translations.sh ++
--- /var/tmp/diff_new_pack.bt2lqL/_old  2017-07-30 11:24:20.455125163 +0200
+++ /var/tmp/diff_new_pack.bt2lqL/_new  2017-07-30 11:24:20.455125163 +0200
@@ -84,8 +84,8 @@
   echo "trimmed output to ${BASEDIR}/${type}/${nfile}"
   echo "trimmed output to $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles"
 
-  sed -e '/^\(Name\[\|GenericName\[\|Comment\[\)/d' -e '/^\[Desktop Entry\]/a \
-X-SuSE-translate=true' "${file}" > "${file}_" && mv "${file}_" "${file}"
+  # Remove translations for Name,GenericName and Comment only in the [Desktop 
Entry] section
+  awk '/^\[/ { translate=0 } /^\[Desktop Entry\]/ { translate=1; print $0; 
print "X-SuSE-translate=true"; next } /^(Name\[|GenericName\[|Comment\[)/ && 
translate==1 { next; } { print $0 }' "${file}" > "${file}_" && mv "${file}_" 
"${file}"
 }
 
 # Handle polkit actions

commit update-desktop-files for openSUSE:Factory

2017-04-29 Thread root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2017-04-29 10:47:11

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is "update-desktop-files"

Sat Apr 29 10:47:11 2017 rev:97 rq:487503 version:12.1

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2015-10-28 17:16:39.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2017-04-29 10:47:12.785723569 +0200
@@ -1,0 +2,9 @@
+Tue Mar 14 16:13:15 UTC 2017 - fv...@suse.com
+
+- Replace brp-trim-desktopfiles with brp-trim-translations:
+  * Supports various kinds of source files, not only desktop files
+  * Generates various tar archives instead of monolithic .desktopfiles file
+- Currently trims desktop file translations only, as polkit/mime/appstream
+do not support gettext translations yet
+
+---

Old:

  brp-trim-desktop.sh

New:

  brp-trim-translations.sh



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.apWIIJ/_old  2017-04-29 10:47:13.641602655 +0200
+++ /var/tmp/diff_new_pack.apWIIJ/_new  2017-04-29 10:47:13.645602090 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 Source: suse_update_desktop_file.sh
 Source1:map-desktop-category.sh
 Source2:macro
-Source4:brp-trim-desktop.sh
+Source4:brp-trim-translations.sh
 # 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).
@@ -37,12 +37,16 @@
 This package provides further translations and a shell script to update
 desktop files. It is used by the %%suse_update_desktop_file rpm macro.
 
-%package -n brp-trim-desktopfiles
-Summary:Trim translations from .deskop files
+%package -n brp-trim-translations
+Summary:Trim translations from desktop files, polkit actions, mimetype 
descriptions and AppStream metainfo
 Group:  Development/Tools/Building
-
-%description -n brp-trim-desktopfiles
-Trim translations from all .deskop files found in build root
+Provides:   brp-trim-desktop = %{version}
+Obsoletes:  brp-trim-desktop < %{version}
+Requires:   libxslt-tools
+
+%description -n brp-trim-translations
+Trim translations from all desktop files, polkit actions, mimetype descriptions
+and AppStream metainfo found in build root
 
 %prep
 %setup -q -n . -D -T 0
@@ -55,7 +59,7 @@
 mkdir -p $RPM_BUILD_ROOT%_rpmconfigdir
 install -m0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT%_rpmconfigdir
 install -m0644 -D %SOURCE2 $RPM_BUILD_ROOT/etc/rpm/macros.%name
-install -m0755 -D %SOURCE4 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-desktopfiles
+install -m0755 -D %SOURCE4 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-translations
 
 %files
 %defattr(-,root,root)
@@ -63,8 +67,9 @@
 %exclude %_rpmconfigdir/brp-suse.d
 /etc/rpm/*
 
-%files -n brp-trim-desktopfiles
+%files -n brp-trim-translations
 %defattr(-,root,root)
-%_rpmconfigdir/brp-suse.d
+%dir %_rpmconfigdir/brp-suse.d/
+%_rpmconfigdir/brp-suse.d/brp-70-trim-translations
 
 %changelog

++ brp-trim-translations.sh ++
#!/bin/bash
# This script goes through all polkit actions, appstream metadata and mimeinfo 
xml data
# and copies the .xml files into a .tar.xz for each kind. Then the xml:lang 
values are
# stripped out.

BASEDIR=`dirname $RPM_SOURCE_DIR`/OTHER

if ! test -f /.buildenv; then
   # this looks fishy, skip it
   echo "WARNING: I better not trim without a /.buildenv around"
   exit 0
fi

if ! test -w $BASEDIR; then
   echo "WARNING: Can't write to $BASEDIR, skipping"
   exit 0
fi

strip_xml_lang() {
  type="$1"
  file="$2"
  notrim="$3"

  if grep -q '^' "$file"; then
return
  fi

  nfile="${file#/$RPM_BUILD_ROOT}"
  mkdir -p "$(dirname "${BASEDIR}/${type}/${nfile}")"
  cp "${file}" "${BASEDIR}/${type}/${nfile}"

  if [ -n "${notrim}" ]; then
  return # Extraction only
  fi

  doctype=
  if [ "$type" = "polkitactions" ]; then
doctype='http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"/>'
  elif [ "$type" = "appstream" ]; then
doctype=''
return # For now
  elif [

commit update-desktop-files for openSUSE:Factory

2015-10-28 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2015-10-28 17:16:38

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is "update-desktop-files"

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-12-03 22:52:26.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2015-10-28 17:16:39.0 +0100
@@ -1,0 +2,6 @@
+Sat Oct 24 05:03:02 UTC 2015 - co...@suse.com
+
+- go back to a specific directory list instead of all in /usr/share
+  (boo#904524)
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.yjqXIv/_old  2015-10-28 17:16:39.0 +0100
+++ /var/tmp/diff_new_pack.yjqXIv/_new  2015-10-28 17:16:39.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ brp-trim-desktop.sh ++
--- /var/tmp/diff_new_pack.yjqXIv/_old  2015-10-28 17:16:39.0 +0100
+++ /var/tmp/diff_new_pack.yjqXIv/_new  2015-10-28 17:16:39.0 +0100
@@ -22,7 +22,16 @@
exit 0
 fi
 
-find /$RPM_BUILD_ROOT/usr/share /$RPM_BUILD_ROOT/etc/xdg/autostart/ \
+find /$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/ \
+  /$RPM_BUILD_ROOT/opt/kde3/share/applnk/ \
+  /$RPM_BUILD_ROOT/usr/share/xsessions/ \
+  /$RPM_BUILD_ROOT/usr/share/applications/ \
+  /$RPM_BUILD_ROOT/usr/share/mimelnk/ \
+  /$RPM_BUILD_ROOT/usr/share/gnome/apps/ \
+  /$RPM_BUILD_ROOT/usr/share/autostart/ \
+  /$RPM_BUILD_ROOT/etc/xdg/autostart/ \
+  /$RPM_BUILD_ROOT/usr/share/wallpapers \
+  /$RPM_BUILD_ROOT/usr/share/autoinstall/ \
 -type f \( -name '*.desktop' -o -name .directory \) 2>/dev/null | while 
read -r FILE; do
 
if grep -q ^X-SuSE-translate= "$FILE"; then

commit update-desktop-files for openSUSE:Factory

2014-12-03 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2014-12-03 22:52:23

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-11-24 11:14:38.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2014-12-03 22:52:26.0 +0100
@@ -1,0 +2,6 @@
+Sat Nov 22 16:46:15 UTC 2014 - stefan.bru...@rwth-aachen.de
+
+- Fix bad variable access for --genericname
+- replace ^M pattern with \r in sed pattern
+
+---



Other differences:
--
++ suse_update_desktop_file.sh ++
--- /var/tmp/diff_new_pack.SCNEEo/_old  2014-12-03 22:52:27.0 +0100
+++ /var/tmp/diff_new_pack.SCNEEo/_new  2014-12-03 22:52:27.0 +0100
@@ -217,7 +217,7 @@
   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
+  sed -e 's/\r//' $i  ${i}_  mv ${i}_ $i
 
   if [ $FILE ]; then
 echo ERROR: suse_update_desktop_file: $APPLICATION has multiple desktop 
files 2
@@ -361,7 +361,7 @@
 if [ $GNAME != no ]; then
 sed -i -e '/^GenericName\[/d' $FILE
 if [ -n $GNAME ]; then
-   if ! grep -q ^GenericName= ${FILE}_; then
+   if ! grep -q ^GenericName= ${FILE}; then
 sed -i -e '/^\[Desktop Entry\]/a 'GenericName=${GNAME//,/\,} ${FILE}
else
  sed -i -e '/^\[Desktop Entry\]/,/(\[.*|$)/ 
s,^GenericName=.*,GenericName='${GNAME//,/\,}',' ${FILE}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2014-11-24 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2014-11-24 11:14:34

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-09-25 09:33:32.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2014-11-24 11:14:38.0 +0100
@@ -1,0 +2,7 @@
+Sat Nov 15 21:09:00 UTC 2014 - Led led...@gmail.com
+
+- fix shebang in suse_update_desktop_file.sh and
+  map-desktop-category.sh scripts that contains bash-specific
+  constructions
+
+---



Other differences:
--
++ map-desktop-category.sh ++
--- /var/tmp/diff_new_pack.zoIX9m/_old  2014-11-24 11:14:39.0 +0100
+++ /var/tmp/diff_new_pack.zoIX9m/_new  2014-11-24 11:14:39.0 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 function mapCategory() {
   ret=
@@ -140,4 +140,3 @@
 *) ret= ;;
   esac
 }
-

++ suse_update_desktop_file.sh ++
--- /var/tmp/diff_new_pack.zoIX9m/_old  2014-11-24 11:14:39.0 +0100
+++ /var/tmp/diff_new_pack.zoIX9m/_new  2014-11-24 11:14:39.0 +0100
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 
 # macro: suse_update_desktop_file
 #

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2014-09-25 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2014-09-25 09:33:31

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-07-26 11:27:54.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2014-09-25 09:33:32.0 +0200
@@ -1,0 +2,5 @@
+Tue Sep 23 08:29:33 UTC 2014 - co...@suse.com
+
+- fix find call, type expects one char
+
+---



Other differences:
--
++ brp-trim-desktop.sh ++
--- /var/tmp/diff_new_pack.iLu5pc/_old  2014-09-25 09:33:33.0 +0200
+++ /var/tmp/diff_new_pack.iLu5pc/_new  2014-09-25 09:33:33.0 +0200
@@ -23,7 +23,7 @@
 fi
 
 find /$RPM_BUILD_ROOT/usr/share /$RPM_BUILD_ROOT/etc/xdg/autostart/ \
--type -f \( -name '*.desktop' -o -name .directory \) 2/dev/null | while 
read -r FILE; do
+-type f \( -name '*.desktop' -o -name .directory \) 2/dev/null | while 
read -r FILE; do
 
if grep -q ^X-SuSE-translate= $FILE; then
   echo DEBUG: $FILE contains X-SuSE-translate - skipping 2

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2014-07-26 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2014-07-26 11:27:51

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-07-02 15:04:31.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2014-07-26 11:27:54.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 24 11:59:42 UTC 2014 - g...@opensuse.org
+
+- handle symlinks, fix quoting problems and unnecessary use of grep
+
+---



Other differences:
--
++ brp-trim-desktop.sh ++
--- /var/tmp/diff_new_pack.91sfwC/_old  2014-07-26 11:27:55.0 +0200
+++ /var/tmp/diff_new_pack.91sfwC/_new  2014-07-26 11:27:55.0 +0200
@@ -23,7 +23,7 @@
 fi
 
 find /$RPM_BUILD_ROOT/usr/share /$RPM_BUILD_ROOT/etc/xdg/autostart/ \
--name *.desktop -o -name .directory 2/dev/null | while read FILE; do
+-type -f \( -name '*.desktop' -o -name .directory \) 2/dev/null | while 
read -r FILE; do
 
if grep -q ^X-SuSE-translate= $FILE; then
   echo DEBUG: $FILE contains X-SuSE-translate - skipping 2
@@ -31,9 +31,9 @@
fi
 
# save for backup 
-   NFILE=${FILE#$RPM_BUILD_ROOT}
+   NFILE=${FILE#$RPM_BUILD_ROOT}
echo $NFILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
-   cat $FILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
+   cat $FILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
# make sure we end with a newline
echo  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
echo trimmed output to $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
@@ -41,10 +41,7 @@
#
# Trim translations (desktops will use gettext to find them)
#
-   grep -v -E '^Name\[|^GenericName\[|^Comment\[' $FILE  ${FILE}_ 
-   sed -i -e '/^\[Desktop Entry\]/a \
-X-SuSE-translate=true' ${FILE}_
-   mv ${FILE}_ $FILE
-
+   sed -e '/^\(Name\[\|GenericName\[\|Comment\[\)/d' -e '/^\[Desktop 
Entry\]/a \
+X-SuSE-translate=true' $FILE  ${FILE}_  mv ${FILE}_ $FILE
 done
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2014-07-02 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2014-07-02 15:04:29

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2014-06-05 10:49:54.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2014-07-02 15:04:31.0 +0200
@@ -1,0 +2,6 @@
+Tue Jul  1 09:49:21 UTC 2014 - co...@suse.com
+
+- just take all *.desktop files in /usr/share (trying to fix autoyast
+  translations)
+
+---



Other differences:
--
++ brp-trim-desktop.sh ++
--- /var/tmp/diff_new_pack.XotMnM/_old  2014-07-02 15:04:32.0 +0200
+++ /var/tmp/diff_new_pack.XotMnM/_new  2014-07-02 15:04:32.0 +0200
@@ -22,13 +22,8 @@
exit 0
 fi
 
-find /$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/ \
-  /$RPM_BUILD_ROOT/opt/kde3/share/applnk/ \
-  /$RPM_BUILD_ROOT/usr/share/xsessions/ \
-  /$RPM_BUILD_ROOT/usr/share/applications/ \
-  /$RPM_BUILD_ROOT/usr/share/mimelnk/ \
-  /$RPM_BUILD_ROOT/usr/share/gnome/apps/ \
-  /$RPM_BUILD_ROOT/etc/xdg/autostart/ -name *.desktop -o -name .directory 
2/dev/null | while read FILE; do
+find /$RPM_BUILD_ROOT/usr/share /$RPM_BUILD_ROOT/etc/xdg/autostart/ \
+-name *.desktop -o -name .directory 2/dev/null | while read FILE; do
 
if grep -q ^X-SuSE-translate= $FILE; then
   echo DEBUG: $FILE contains X-SuSE-translate - skipping 2

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2014-06-05 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2014-06-05 10:49:52

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2013-09-27 19:08:40.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2014-06-05 10:49:54.0 +0200
@@ -1,0 +2,5 @@
+Mon Jun  2 10:17:18 UTC 2014 - co...@suse.com
+
+- also allow X-SuSE-YaST-High_Availability
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.k8aiwa/_old  2014-06-05 10:49:56.0 +0200
+++ /var/tmp/diff_new_pack.k8aiwa/_new  2014-06-05 10:49:56.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ map-desktop-category.sh ++
--- /var/tmp/diff_new_pack.k8aiwa/_old  2014-06-05 10:49:56.0 +0200
+++ /var/tmp/diff_new_pack.k8aiwa/_new  2014-06-05 10:49:56.0 +0200
@@ -109,7 +109,7 @@
 Security|RemoteAccess) ret=$in ;;
 ServiceConfiguration| \
 
Backup|YaST|YaST-Hardware|YaST-Misc|YaST-Network|YaST-Virtualization|YaST-Support|
 \
-
Feedback|YaST-Net_advanced|YaST-Security|YaST-Software|YaST-System|YaST-AppArmor)
+
Feedback|YaST-Net_advanced|YaST-Security|YaST-Software|YaST-System|YaST-AppArmor|YaST-High_Availability)
ret=X-SuSE-$in ;;
 #Utility Menu:
 Telephony|Accessibility|TextEditor|PDA|Calculator|Clock) ret=$in ;;

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2013-09-27 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2013-09-27 19:08:39

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2013-06-19 15:54:11.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2013-09-27 19:08:40.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 27 09:57:45 UTC 2013 - co...@suse.com
+
+- make sure the files can be split correctly (bnc#841090)
+
+---



Other differences:
--
++ brp-trim-desktop.sh ++
--- /var/tmp/diff_new_pack.HLNwJo/_old  2013-09-27 19:08:40.0 +0200
+++ /var/tmp/diff_new_pack.HLNwJo/_new  2013-09-27 19:08:40.0 +0200
@@ -39,6 +39,8 @@
NFILE=${FILE#$RPM_BUILD_ROOT}
echo $NFILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
cat $FILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
+   # make sure we end with a newline
+   echo  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
echo trimmed output to $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
 
#

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2013-06-19 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2013-06-19 15:16:59

Comparing /work/SRC/openSUSE:Factory/update-desktop-files (Old)
 and  /work/SRC/openSUSE:Factory/.update-desktop-files.new (New)


Package is update-desktop-files

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2012-04-17 22:03:11.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2013-06-19 15:54:11.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 18 20:04:08 CEST 2013 - sbra...@suse.cz
+
+- Add Categories introduced in the new Desktop Menu Specification
+  (map-desktop-category.sh, bnc#443364), map removed PuzzleGame.
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.yMWlmn/_old  2013-06-19 15:54:13.0 +0200
+++ /var/tmp/diff_new_pack.yMWlmn/_new  2013-06-19 15:54:13.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ map-desktop-category.sh ++
--- /var/tmp/diff_new_pack.yMWlmn/_old  2013-06-19 15:54:13.0 +0200
+++ /var/tmp/diff_new_pack.yMWlmn/_new  2013-06-19 15:54:13.0 +0200
@@ -45,6 +45,10 @@
ret=Teaching
echo WARNING: School is an outdated Category, mapping it to Teaching
;;
+PuzzleGame)
+   ret=LogicGame
+   echo WARNING: PuzzleGame is an outdated Category, mapping it to 
LogicGame
+   ;;
 
 
 #special cases
@@ -82,7 +86,7 @@
 Warehouse|Addressbook)
ret=X-SuSE-$in;;
 #Internet/Network Menu:
-
P2P|HamRadio|Email|News|Dialup|IRCClient|FileTransfer|InstantMessaging|WebBrowser|WebDevelopment)
 ret=$in ;;
+
P2P|HamRadio|Email|News|Dialup|IRCClient|FileTransfer|InstantMessaging|WebBrowser|WebDevelopment|Feed)
 ret=$in ;;
 RSS-News)
ret=X-SuSE-$in;;
 #Development Menu:
@@ -90,10 +94,10 @@
 Design)
ret=X-SuSE-$in;;
 #Graphics Menu:
-
3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics) 
ret=$in ;;
-#Education Menu:
-Teaching|Science|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-Engineering|Geography) ret=$in ;;
+
3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps)
 ret=$in ;;
+#Education and Science Menu:
+Teaching|Math|Chemistry|Astronomy|Art|Construction|Languages| \
+Engineering|Geography|Spirituality|Humanities) ret=$in ;;
 #Multimedia Menu:
 AudioVideoEditing|Music|DiscBurning|Mixer|Player|Midi|Sequencer| \
 TV|Tuner|Recorder|Video) ret=$in ;;
@@ -114,7 +118,7 @@
 #Game Menu:
 3DGame|Amusement|ArcadeGame|CardGame|FirstPersonGame|BoardGame|\
 PlatformGame|PuzzleGame|SportsGame|StrategyGame|BlocksGame| \
-ActionGame|AdventureGame|KidsGame|LogicGame|Simulation|RolePlaying)
+ActionGame|AdventureGame|KidsGame|LogicGame|Simulation|RolePlaying|Shooter)
ret=$in ;;
 #Control Center Categories:
 
ControlCenter-Personal|ControlCenter-Hardware|ControlCenter-LookAndFeel|ControlCenter-System)
@@ -126,7 +130,7 @@
 Application|Qt|KDE|GTK|GNOME|XFCE|Motif|ConsoleOnly|Shell|X-Red-*| \
 X-Ximian-*|X-GNOME-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \
 Office|Network|Game|Graphics|Education|Documentation|Development| \
-Viewer|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
+Viewer|Science|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
 Core-Edutainment|Core-Game|Core-Graphics|Core-Internet| \
 Core-Multimedia|Core-Office|Core-Settings|Core-Utility|Core-System| \
 Core-Configuration|Core-Development|core)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2012-04-17 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2012-04-17 22:03:10

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 co...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2011-12-20 14:28:10.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2012-04-17 22:03:11.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 13 13:24:04 UTC 2012 - g...@opensuse.org
+
+- accept new XFCE category
+
+---



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.biuOvt/_old  2012-04-17 22:03:12.0 +0200
+++ /var/tmp/diff_new_pack.biuOvt/_new  2012-04-17 22:03:12.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,7 @@
 
 %package -n brp-trim-desktopfiles
 Summary:Trim translations from .deskop files
+Group:  Development/Tools/Building
 
 %description -n brp-trim-desktopfiles
 Trim translations from all .deskop files found in build root

++ map-desktop-category.sh ++
--- /var/tmp/diff_new_pack.biuOvt/_old  2012-04-17 22:03:12.0 +0200
+++ /var/tmp/diff_new_pack.biuOvt/_new  2012-04-17 22:03:12.0 +0200
@@ -123,7 +123,7 @@
 X-Xfce*|X-XFCE*)
ret=$in ;;
 #special tags:
-Application|Qt|KDE|GTK|GNOME|Motif|ConsoleOnly|Shell|X-Red-*| \
+Application|Qt|KDE|GTK|GNOME|XFCE|Motif|ConsoleOnly|Shell|X-Red-*| \
 X-Ximian-*|X-GNOME-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \
 Office|Network|Game|Graphics|Education|Documentation|Development| \
 Viewer|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2011-12-20 Thread h_root 
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 co...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2011-12-14 14:35:18.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2011-12-20 14:28:10.0 +0100
@@ -1,0 +2,15 @@
+Fri Dec 16 10:20:44 UTC 2011 - co...@suse.com
+
+- give warning for old options instead of error
+
+---
+Fri Dec 16 09:49:24 UTC 2011 - co...@suse.com
+
+- use sed with inline option to avoid leaving temporary files behind
+
+---
+Thu Dec 15 12:44:49 UTC 2011 - co...@suse.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.jNOqOF/_new  2011-12-20 14:28:11.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.jNOqOF/_new  2011-12-20 14:28:11.0 +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

commit update-desktop-files for openSUSE:Factory

2011-12-14 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2011-12-14 14:35:16

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 co...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/update-desktop-files/update-desktop-files.changes
2011-10-02 11:17:21.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.update-desktop-files.new/update-desktop-files.changes
   2011-12-14 14:35:18.0 +0100
@@ -1,0 +2,6 @@
+Fri Dec  9 14:26:41 UTC 2011 - co...@suse.com
+
+- split brp-trim-desktopfiles that installs a brp script to trim all 
+  .desktop files without need of an extra macro
+
+---

New:

  brp-trim-desktop.sh



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.V7PGmw/_old  2011-12-14 14:35:19.0 +0100
+++ /var/tmp/diff_new_pack.V7PGmw/_new  2011-12-14 14:35:19.0 +0100
@@ -15,21 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   update-desktop-files
 Version:12.1
-Release:1
+Release:0
 Summary:A Build Tool to Update Desktop Files
 License:GPL-2.0+
 Group:  Development/Tools/Building
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:on
 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
@@ -39,7 +37,13 @@
 
 %description
 This package provides further translations and a shell script to update
-desktop files. It is used by the %suse_update_desktop_file rpm macro.
+desktop files. It is used by the %%suse_update_desktop_file rpm macro.
+
+%package -n brp-trim-desktopfiles
+Summary:Trim translations from .deskop files
+
+%description -n brp-trim-desktopfiles
+Trim translations from all .deskop files found in build root
 
 %prep
 %setup -q -n . -D -T 0
@@ -53,13 +57,16 @@
 install -m0755 %SOURCE0 %SOURCE1 %SOURCE100 $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
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m0755 -D %SOURCE4 
$RPM_BUILD_ROOT/usr/lib/rpm/brp-suse.d/brp-70-trim-desktopfiles
 
 %files
 %defattr(-,root,root)
 %_rpmconfigdir/*
+%exclude %_rpmconfigdir/brp-suse.d
 /etc/rpm/*
 
+%files -n brp-trim-desktopfiles
+%defattr(-,root,root)
+%_rpmconfigdir/brp-suse.d
+
 %changelog

++ brp-trim-desktop.sh ++
#! /bin/sh

# macro: suse_update_desktop_file
#
# Used to add easily a category to .desktop files according to XDG
# standard.
#

#
# find file
#
BASEDIR=`dirname $RPM_SOURCE_DIR`/OTHER

if ! test -f /.buildenv; then
   # this looks fishy, skip it
   echo WARNING: I better not trim without a /.buildenv around
   exit 0
fi

if ! test -w $BASEDIR; then
   echo WARNING: Can't write to $BASEDIR, skipping
   exit 0
fi

find /$RPM_BUILD_ROOT/opt/kde3/share/applications/kde/ \
  /$RPM_BUILD_ROOT/opt/kde3/share/applnk/ \
  /$RPM_BUILD_ROOT/usr/share/xsessions/ \
  /$RPM_BUILD_ROOT/usr/share/applications/ \
  /$RPM_BUILD_ROOT/usr/share/mimelnk/ \
  /$RPM_BUILD_ROOT/usr/share/gnome/apps/ \
  /$RPM_BUILD_ROOT/etc/xdg/autostart/ -name *.desktop -o -name .directory 
2/dev/null | while read FILE; do

if grep -q ^X-SuSE-translate= $FILE; then
   echo DEBUG: $FILE contains X-SuSE-translate - skipping 2
   continue
fi

# save for backup 
NFILE=${FILE#$RPM_BUILD_ROOT}
echo $NFILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
cat $FILE  $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles
echo trimmed output to $BASEDIR/$RPM_PACKAGE_NAME.desktopfiles

#
# Trim translations (desktops will use gettext to find them)
#
grep -v -E '^Name\[|^GenericName\[|^Comment\[' $FILE  ${FILE}_ 
sed -i -e '/^\[Desktop Entry\]/a \
X-SuSE-translate=true' ${FILE}_
mv ${FILE}_ $FILE

done

++ macro ++
--- /var/tmp/diff_new_pack.V7PGmw/_old  2011-12-14 14:35:19.0 +0100
+++ /var/tmp/diff_new_pack.V7PGmw/_new  2011-12-14 14:35:19.0 +0100
@@ -2,5 +2,5 @@
 # Used to add easily a category to .desktop files according to XDG
 # standard.
 %suse_update_desktop_file(cinrud:D:N:C:G:) \

commit update-desktop-files for openSUSE:Factory

2011-12-06 Thread h_root 
Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory checked in at 2011-12-06 19:10:40

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 co...@suse.com

Changes:




Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.VCn4Jg/_old  2011-12-06 19:45:09.0 +0100
+++ /var/tmp/diff_new_pack.VCn4Jg/_new  2011-12-06 19:45:09.0 +0100
@@ -22,7 +22,7 @@
 Version:12.1
 Release:1
 Summary:A Build Tool to Update Desktop Files
-License:GPLv2+
+License:GPL-2.0+
 Group:  Development/Tools/Building
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 AutoReqProv:on

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2011-10-02 Thread h_root 

Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory
checked in at Sun Oct 2 11:17:22 CEST 2011.




--- openSUSE:Factory/update-desktop-files/update-desktop-files.changes  
2011-09-23 12:49:31.0 +0200
+++ 
/mounts/work_src_done/STABLE/update-desktop-files/update-desktop-files.changes  
2011-09-29 16:59:12.0 +0200
@@ -1,0 +2,7 @@
+Thu Sep 29 14:58:16 UTC 2011 - vu...@opensuse.org
+
+- Update suse_update_desktop_file.sh: when -u is used, do not add
+  the non-standard X-SuSE-Unimportant=true anymore, but
+  NoDisplay=true.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ suse_update_desktop_file.sh ++
--- /var/tmp/diff_new_pack.ZjXwvk/_old  2011-10-02 11:17:18.0 +0200
+++ /var/tmp/diff_new_pack.ZjXwvk/_new  2011-10-02 11:17:18.0 +0200
@@ -45,7 +45,7 @@
echoExample: use 
\%suse_update_desktop_file \\
echo
%{buildroot}%{_datadir}/susehelp/meta/%name/%name.desktop\
echoto edit the susehelp desktop 
entry file instead.
-   echo-u|--unimportant  : add 
\X-SuSE-Unimportant=true\ to the resulting desktop
+   echo-u|--unimportant  : add \NoDisplay=true\ to the 
resulting desktop
echofile.
echo-n|--no-i18n  : Do not prepare the desktop 
file for translators (obsoletes -t).
echo(adds X-SuSE-translate=false 
to the desktop file)
@@ -314,8 +314,13 @@
   fi
 fi
 if [ $UNIMPORTANT = yes ]; then
-  sed -e '/^\[Desktop Entry\]/a \
-X-SuSE-Unimportant=true' $FILE  ${FILE}_  mv ${FILE}_ $FILE
+  if grep -q ^NoDisplay= $FILE; then
+sed -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^NoDisplay=.*,NoDisplay=true,' 
$FILE  ${FILE}.new  
+mv ${FILE}.new ${FILE} 
+  else
+sed -e '/^\[Desktop Entry\]/a \
+NoDisplay=true' $FILE  ${FILE}_  mv ${FILE}_ $FILE
+  fi
 fi
 if [ $DOCID ]; then
   sed -e '/^\[Desktop Entry\]/a \

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit update-desktop-files for openSUSE:Factory

2011-06-07 Thread h_root 

Hello community,

here is the log from the commit of package update-desktop-files for 
openSUSE:Factory
checked in at Tue Jun 7 09:06:45 CEST 2011.




--- update-desktop-files/update-desktop-files.changes   2011-01-26 
01:15:30.0 +0100
+++ 
/mounts/work_src_done/STABLE/update-desktop-files/update-desktop-files.changes  
2011-06-06 16:17:59.0 +0200
@@ -1,0 +2,6 @@
+Mon Jun  6 14:13:56 UTC 2011 - co...@novell.com
+
+- ship desktop.attr together with the .prov script for rpm
+  automatic mimehandler provides
+
+---

calling whatdependson for head-i586


New:

  desktop.attr



Other differences:
--
++ update-desktop-files.spec ++
--- /var/tmp/diff_new_pack.2SZgp0/_old  2011-06-07 09:02:08.0 +0200
+++ /var/tmp/diff_new_pack.2SZgp0/_new  2011-06-07 09:02:08.0 +0200
@@ -19,8 +19,8 @@
 
 
 Name:   update-desktop-files
-Version:11.3
-Release:7
+Version:12.1
+Release:1
 Summary:A Build Tool to Update Desktop Files
 License:GPLv2+
 Group:  Development/Tools/Building
@@ -29,6 +29,7 @@
 Source: suse_update_desktop_file.sh
 Source1:map-desktop-category.sh
 Source2:macro
+Source3:desktop.attr
 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
@@ -48,17 +49,17 @@
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
-install -m 0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/rpm
-install -m0755 %SOURCE100 $RPM_BUILD_ROOT/usr/lib/rpm
+mkdir -p $RPM_BUILD_ROOT%_rpmconfigdir
+install -m0755 %SOURCE0 %SOURCE1 %SOURCE100 $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/lib/rpm/*
+%_rpmconfigdir/*
 /etc/rpm/*
 
 %changelog

++ desktop.attr ++
%__desktop_provides %{_rpmconfigdir}/mimetypes.prov
%__desktop_path .*\\.desktop$





Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org