commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2020-01-12 23:15:32 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.6675 (New) Package is "desktop-data-openSUSE" Sun Jan 12 23:15:32 2020 rev:83 rq:761664 version:15.2.20200107 Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2019-12-02 11:30:54.218572276 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.6675/desktop-data-openSUSE.changes 2020-01-12 23:15:40.630622915 +0100 @@ -1,0 +2,6 @@ +Tue Jan 7 16:42:23 UTC 2020 - Stasiek Michalski + +- Update to version 15.2.20200107: + * Fix csh (boo#1158422) + +--- Old: desktop-data-15.1.20191124.tar.xz New: desktop-data-15.2.20200107.tar.xz Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.yUa7oX/_old 2020-01-12 23:15:41.902623386 +0100 +++ /var/tmp/diff_new_pack.yUa7oX/_new 2020-01-12 23:15:41.926623395 +0100 @@ -2,7 +2,7 @@ # spec file for package desktop-data-openSUSE # # Copyright (c) 2019 SUSE LLC. -# Copyright (c) 2018 Stasiek Michalski +# Copyright (c) 2018-2020 Stasiek Michalski # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ %endif Name: desktop-data-openSUSE -Version:15.1.20191124 +Version:15.2.20200107 Release:0 Summary:Shared Desktop Files for openSUSE License:GPL-2.0-or-later ++ _service ++ --- /var/tmp/diff_new_pack.yUa7oX/_old 2020-01-12 23:15:42.090623455 +0100 +++ /var/tmp/diff_new_pack.yUa7oX/_new 2020-01-12 23:15:42.094623457 +0100 @@ -3,7 +3,7 @@ git git://github.com/openSUSE/desktop-data.git desktop-data -15.1.%cd +15.2.%cd update_rpm enable ++ _servicedata ++ --- /var/tmp/diff_new_pack.yUa7oX/_old 2020-01-12 23:15:42.282623526 +0100 +++ /var/tmp/diff_new_pack.yUa7oX/_new 2020-01-12 23:15:42.294623531 +0100 @@ -1,4 +1,4 @@ git://github.com/openSUSE/desktop-data.git - a76ecaa15b1359f5721eac23b9c184e1bccb2201 \ No newline at end of file + 705b80cfa6300d2360098f300a59da2590ca528f \ No newline at end of file ++ desktop-data-15.1.20191124.tar.xz -> desktop-data-15.2.20200107.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop-data-15.1.20191124/etc/profile.d/desktop-data.csh new/desktop-data-15.2.20200107/etc/profile.d/desktop-data.csh --- old/desktop-data-15.1.20191124/etc/profile.d/desktop-data.csh 2019-11-24 16:03:28.0 +0100 +++ new/desktop-data-15.2.20200107/etc/profile.d/desktop-data.csh 2020-01-07 17:36:00.0 +0100 @@ -30,7 +30,7 @@ endif if ( "$location" == "local" ) then eval `sed -n -e 's/^\(X_MOUSE_CURSOR\) *=/set \1=/p' < /etc/sysconfig/windowmanager` - if (! "$X_MOUSE_CURSOR" == "" ) then + if ( "$X_MOUSE_CURSOR" != "" ) then setenv XCURSOR_THEME "$X_MOUSE_CURSOR" unset XCURSOR_THEME endif
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2019-12-02 11:28:42 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.4691 (New) Package is "desktop-data-openSUSE" Mon Dec 2 11:28:42 2019 rev:82 rq:750568 version:15.1.20191124 Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2018-12-27 00:24:03.791924330 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.4691/desktop-data-openSUSE.changes 2019-12-02 11:30:54.218572276 +0100 @@ -1,0 +2,15 @@ +Sun Nov 24 15:08:33 UTC 2019 - hel...@mailbox.org + +- Update to version 15.1.20191124: + * Remove remaining wallpapers + * Remove unused icon directory + * Don't set cursor on empty input +- No longer requires DMZ Cursors, as the fillup no longer contains + the theme by default + +--- +Thu Oct 17 17:25:56 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + +--- Old: desktop-data-15.1.20181213.tar.xz New: desktop-data-15.1.20191124.tar.xz Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.3Gx6vX/_old 2019-12-02 11:30:56.022571441 +0100 +++ /var/tmp/diff_new_pack.3Gx6vX/_new 2019-12-02 11:30:56.026571440 +0100 @@ -1,7 +1,7 @@ # # spec file for package desktop-data-openSUSE # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # Copyright (c) 2018 Stasiek Michalski # # All modifications and additions to the file contributed by third parties @@ -12,7 +12,7 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -27,12 +27,11 @@ %endif Name: desktop-data-openSUSE -Version:15.1.20181213 +Version:15.1.20191124 Release:0 Summary:Shared Desktop Files for openSUSE -Url:https://github.com/openSUSE/desktop-data License:GPL-2.0-or-later -Group: System/GUI/Other +URL:https://github.com/openSUSE/desktop-data Source: desktop-data-%{version}.tar.xz Source1:%name.fillup @@ -44,36 +43,28 @@ BuildRequires: hicolor-icon-theme BuildRequires: perl-RPC-XML BuildRequires: update-desktop-files +BuildRequires: wallpaper-branding BuildRequires: xdg-menu BuildRequires: xdg-utils -BuildRequires: wallpaper-branding %if 0%{?is_opensuse} BuildRequires: branding-openSUSE %endif Requires: hicolor-icon-theme Requires: xdg-utils -# This is the default cursor theme we reference in /etc/sysconfig/windowmanager -Requires: dmz-icon-theme-cursors %if 0%{?is_opensuse} Requires: wallpaper-branding = %{branding_version} %endif Provides: desktop-branding = %{version} Provides: desktop-data +Provides: desktop-data-openSUSE-extra + +Obsoletes: desktop-data-openSUSE-extra %description This package contains shared desktop files, like the default -applications menu structure and the default wallpaper. - -%package extra -Summary:Additional wallpapers -Group: System/GUI/Other -Requires: desktop-data-openSUSE -Enhances: desktop-data-openSUSE - -%description extra -This package contains additional wallpapers. +applications menu structure. %prep %setup -n desktop-data-%{version} @@ -86,7 +77,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged # Update all desktop files -for i in %{buildroot}%{_datadir}/desktop-directories/*.directory %{buildroot}%{_datadir}/wallpapers/*.desktop +for i in %{buildroot}%{_datadir}/desktop-directories/*.directory do %suse_update_desktop_file "$i" done @@ -101,9 +92,6 @@ ln -snf xdg-open %{buildroot}%{_bindir}/call-browser ln -snf xdg-open %{buildroot}%{_bindir}/desktop-launch -# Check duplicates -%fdupes %{buildroot}%{_datadir}/icons - %check # Check if it's a valid menu export XDG_DATA_DIRS=%{buildroot}%{_datadir}/ @@ -119,13 +107,8 @@ %config(noreplace) %{_sysconfdir}/xdg/menus/*.menu %config %{_sysconfdir}/profile.d/desktop-data.* %{_datadir}/desktop-* -%{_datadir}/icons/hicolor/* %{_fillupdir}/sysconfig.windowmanager-%name %{_bindir}/call-browser %{_bindir}/desktop-launch -%files extra -%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra.xml -%{_datadir}/wallpapers/ - %changelog ++ _ser
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2018-12-27 00:24:01 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.28833 (New) Package is "desktop-data-openSUSE" Thu Dec 27 00:24:01 2018 rev:81 rq:657955 version:15.1.20181213 Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2017-12-02 13:11:04.317495427 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.28833/desktop-data-openSUSE.changes 2018-12-27 00:24:03.791924330 +0100 @@ -1,0 +2,8 @@ +Fri Dec 14 03:58:30 UTC 2018 - hel...@opensuse.org + +- Update to version 15.1.20181213: + * Replace old menus and set wallpapers for Gnome + * Remove all irrelevant stuff from KDE4, Novell and duplicated icons + * Fix up cursors not working by default, DMZ theme doesn't exist + +--- Old: desktop-data-15.0.20171024.tar.xz New: desktop-data-15.1.20181213.tar.xz Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.zs6w8d/_old 2018-12-27 00:24:04.835923479 +0100 +++ /var/tmp/diff_new_pack.zs6w8d/_new 2018-12-27 00:24:04.835923479 +0100 @@ -2,6 +2,7 @@ # spec file for package desktop-data-openSUSE # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 Stasiek Michalski # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,8 +12,8 @@ # case the license is the MIT License). An "Open Source License" is a # 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/ # @@ -21,39 +22,45 @@ %define _fillupdir /var/adm/fillup-templates %endif +%if 0%{?is_opensuse} +%define branding_version %(rpm -q --queryformat '%%{VERSION}' branding-openSUSE) +%endif + Name: desktop-data-openSUSE +Version:15.1.20181213 +Release:0 +Summary:Shared Desktop Files for openSUSE +Url:https://github.com/openSUSE/desktop-data +License:GPL-2.0-or-later +Group: System/GUI/Other + +Source: desktop-data-%{version}.tar.xz +Source1:%name.fillup +BuildArch: noarch + +PreReq: %fillup_prereq + BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: perl-RPC-XML BuildRequires: update-desktop-files BuildRequires: xdg-menu BuildRequires: xdg-utils -Version:15.0.20171024 -Release:0 -Summary:Shared Desktop Files for openSUSE -License:GPL-2.0+ -Group: System/GUI/Other -Obsoletes: susewm -Provides: desktop-data -Obsoletes: desktop-data-NLD < 11.0 -PreReq: /bin/rm -PreReq: %fillup_prereq -# some soft Requires: Crystalcursors -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: wallpaper-branding +%if 0%{?is_opensuse} +BuildRequires: branding-openSUSE +%endif + Requires: hicolor-icon-theme Requires: xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors -Requires: wallpaper-branding >= 13.3 -Source: desktop-data-%{version}.tar.xz -Source1:%name.fillup -BuildArch: noarch -Provides: desktop-data-SuSE = 11.0 -Obsoletes: CheckHardware <= 0.1 -Obsoletes: desktop-data-SuSE <= 11.0 -Provides: CheckHardware = 0.1 -Obsoletes: gnome2-SuSE <= 10.3 +%if 0%{?is_opensuse} +Requires: wallpaper-branding = %{branding_version} +%endif + Provides: desktop-branding = %{version} +Provides: desktop-data %description This package contains shared desktop files, like the default @@ -63,9 +70,6 @@ Summary:Additional wallpapers Group: System/GUI/Other Requires: desktop-data-openSUSE -Provides: desktop-data-SuSE-extra = 11.0 -Obsoletes: desktop-data-SuSE-extra <= 11.0 -Provides: desktop-data-SuSE:/usr/share/wallpapers/Bear.jpg Enhances: desktop-data-openSUSE %description extra @@ -75,110 +79,53 @@ %setup -n desktop-data-%{version} %build -# Convert KDE style wallpaper desktop files to gnome-wp-list -mkdir -p usr/share/gnome-background-properties -cat >usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml < - - -EOF -for i in usr/share/wallpapers/*.desktop -do - IMG=${i#desktop-data} -
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2017-12-02 13:10:52 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Sat Dec 2 13:10:52 2017 rev:80 rq:545919 version:15.0.20171024 Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2017-11-03 16:32:25.735660282 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2017-12-02 13:11:04.317495427 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:49:11 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.ga8EFZ/_old 2017-12-02 13:11:06.577413112 +0100 +++ /var/tmp/diff_new_pack.ga8EFZ/_new 2017-12-02 13:11:06.581412966 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: desktop-data-openSUSE BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -111,9 +116,9 @@ # # define default mouse cursor # -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/ +mkdir -p $RPM_BUILD_ROOT%{_fillupdir}/ install -m 0644 %SOURCE1 \ - $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.windowmanager-%name + $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.windowmanager-%name # # is it a valid menu ? # @@ -162,7 +167,7 @@ /usr/share/icons/oxygen/*/*/* /usr/share/pixmaps/* /etc/profile.d/desktop-data.* -/var/adm/fillup-templates/sysconfig.windowmanager-%name +%{_fillupdir}/sysconfig.windowmanager-%name /usr/bin/call-browser /usr/bin/desktop-launch %dir /etc/kde4
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2017-11-03 16:31:42 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Fri Nov 3 16:31:42 2017 rev:79 rq:536932 version:15.0.20171024 Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2016-02-25 21:42:24.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2017-11-03 16:32:25.735660282 +0100 @@ -1,0 +2,12 @@ +Thu Oct 26 16:53:52 UTC 2017 - dims...@opensuse.org + +- Update to version 15.0.20171024: + * Remove update_rpm: the package has been converted to _service + +--- +Mon Oct 23 13:56:00 UTC 2017 - dims...@opensuse.org + +- Update to version 15.0.20171023: + * Drop /etc/skel/public_html (boo#1064226). + +--- Old: desktop-data-13.3.tar.xz New: _servicedata desktop-data-15.0.20171024.tar.xz Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.Sw7O7I/_old 2017-11-03 16:32:27.675589672 +0100 +++ /var/tmp/diff_new_pack.Sw7O7I/_new 2017-11-03 16:32:27.679589527 +0100 @@ -1,7 +1,7 @@ # # spec file for package desktop-data-openSUSE # -# Copyright (c) 2016 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 @@ -23,7 +23,7 @@ BuildRequires: update-desktop-files BuildRequires: xdg-menu BuildRequires: xdg-utils -Version:13.3 +Version:15.0.20171024 Release:0 Summary:Shared Desktop Files for openSUSE License:GPL-2.0+ @@ -39,7 +39,7 @@ Requires: xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors -Requires: wallpaper-branding = %{version} +Requires: wallpaper-branding >= 13.3 Source: desktop-data-%{version}.tar.xz Source1:%name.fillup BuildArch: noarch @@ -165,7 +165,6 @@ /var/adm/fillup-templates/sysconfig.windowmanager-%name /usr/bin/call-browser /usr/bin/desktop-launch -/etc/skel/public_html %dir /etc/kde4 %dir /etc/kde4/kdm %config /etc/kde4/kdm/backgroundrc ++ _service ++ --- /var/tmp/diff_new_pack.Sw7O7I/_old 2017-11-03 16:32:27.707588508 +0100 +++ /var/tmp/diff_new_pack.Sw7O7I/_new 2017-11-03 16:32:27.711588362 +0100 @@ -3,8 +3,9 @@ git git://github.com/openSUSE/desktop-data.git desktop-data -13.3 +15.0.%cd update_rpm +enable *.tar ++ _servicedata ++ git://github.com/openSUSE/desktop-data.git 111489469ae031c0d5a89f6b48bfe98f73ed466f++ desktop-data-13.3.tar.xz -> desktop-data-15.0.20171024.tar.xz ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-13.3.tar.xz /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-15.0.20171024.tar.xz differ: char 25, line 1
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2016-02-25 21:42:17 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2016-02-05 00:30:31.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2016-02-25 21:42:24.0 +0100 @@ -1,0 +2,11 @@ +Tue Feb 16 12:57:54 UTC 2016 - alarr...@suse.com + +- Upgraded package from upstream sources. +- Removed the update_rpm script and replaced it with a proper + obs source service (disabled by default). Use xz compression + instead of bz2. +- Removed package_edutainment.png icon "patch" since it's now + properly installed from the upstream sources. +- Updated the spec file accordingly. + +--- Old: desktop-data.tar.bz2 package_edutainment.png update_rpm New: _service desktop-data-13.3.tar.xz Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.9O43PN/_old 2016-02-25 21:42:26.0 +0100 +++ /var/tmp/diff_new_pack.9O43PN/_new 2016-02-25 21:42:26.0 +0100 @@ -40,11 +40,8 @@ # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors Requires: wallpaper-branding = %{version} -Source: desktop-data.tar.bz2 +Source: desktop-data-%{version}.tar.xz Source1:%name.fillup -Source2:update_rpm -# PATCH-FIX-OPENSUSE package_edutainment.png bnc#953027 -- added missing icon for yast's software management module, for the education package group -Source3:package_edutainment.png BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: CheckHardware <= 0.1 @@ -70,21 +67,21 @@ This package contains additional wallpapers. %prep -%setup -q -c +%setup -n desktop-data-%{version} %build # Convert KDE style wallpaper desktop files to gnome-wp-list -mkdir -p desktop-data/usr/share/gnome-background-properties -cat >desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml <$i ' + sed -n >>usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml <$i ' 1i \ $a \ @@ -100,12 +97,12 @@ # And finally delete X-GNOME-WP-* entries, not needed for KDE style desktop files. sed -i '/^X-GNOME-WP-/d' $i done -cat >>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml <>usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml < EOF %install -cp -a desktop-data/* $RPM_BUILD_ROOT/ +cp -a * $RPM_BUILD_ROOT/ mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged for i in $RPM_BUILD_ROOT/usr/share/desktop-directories/*.directory $RPM_BUILD_ROOT/usr/share/wallpapers/*.desktop do @@ -118,13 +115,6 @@ install -m 0644 %SOURCE1 \ $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.windowmanager-%name # -# This icon was added to upstream but while a fixed version is released -# we install it manually -# -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps -install -m 0644 %SOURCE3 \ - $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/package_edutainment.png -# # is it a valid menu ? # export XDG_DATA_DIRS=$RPM_BUILD_ROOT/usr/share/ ++ _service ++ git git://github.com/openSUSE/desktop-data.git desktop-data 13.3 update_rpm *.tar xz
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2016-02-05 00:30:30 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2015-12-29 12:58:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2016-02-05 00:30:31.0 +0100 @@ -1,0 +2,6 @@ +Thu Jan 28 17:13:36 UTC 2016 - alarr...@suse.com + +- Added package_edutainment.png which is used by Yast's software + management module as Education package group icon (bnc#953027) + +--- New: package_edutainment.png Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.1fILzV/_old 2016-02-05 00:30:33.0 +0100 +++ /var/tmp/diff_new_pack.1fILzV/_new 2016-02-05 00:30:33.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package desktop-data-openSUSE # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -43,6 +43,8 @@ Source: desktop-data.tar.bz2 Source1:%name.fillup Source2:update_rpm +# PATCH-FIX-OPENSUSE package_edutainment.png bnc#953027 -- added missing icon for yast's software management module, for the education package group +Source3:package_edutainment.png BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: CheckHardware <= 0.1 @@ -116,6 +118,13 @@ install -m 0644 %SOURCE1 \ $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.windowmanager-%name # +# This icon was added to upstream but while a fixed version is released +# we install it manually +# +mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps +install -m 0644 %SOURCE3 \ + $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/package_edutainment.png +# # is it a valid menu ? # export XDG_DATA_DIRS=$RPM_BUILD_ROOT/usr/share/
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2015-12-29 12:58:37 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-11-28 08:45:55.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2015-12-29 12:58:38.0 +0100 @@ -1,0 +2,5 @@ +Sat Dec 19 20:09:09 UTC 2015 - dims...@opensuse.org + +- Bump version to 13.3 + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.znNAe6/_old 2015-12-29 12:58:41.0 +0100 +++ /var/tmp/diff_new_pack.znNAe6/_new 2015-12-29 12:58:41.0 +0100 @@ -23,7 +23,7 @@ BuildRequires: update-desktop-files BuildRequires: xdg-menu BuildRequires: xdg-utils -Version:13.2 +Version:13.3 Release:0 Summary:Shared Desktop Files for openSUSE License:GPL-2.0+
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-11-28 08:45:52 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-11-14 09:18:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-11-28 08:45:55.0 +0100 @@ -1,0 +2,7 @@ +Fri Nov 14 13:04:22 UTC 2014 - g...@opensuse.org + +- Remove package-manager.desktop again, yast2-packager now provides + yast2-packager.desktop which handles rpm files again +- optimize update_rpm script and fix git URL + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.7RBWny/_old 2014-11-28 08:45:59.0 +0100 +++ /var/tmp/diff_new_pack.7RBWny/_new 2014-11-28 08:45:59.0 +0100 @@ -109,7 +109,6 @@ do %suse_update_desktop_file "$i" done -%suse_update_desktop_file package-manager # # define default mouse cursor # @@ -163,7 +162,6 @@ %dir /usr/share/icons/oxygen/32x32/apps /usr/share/icons/oxygen/*/*/* /usr/share/pixmaps/* -/usr/share/applications/package-manager.desktop /etc/profile.d/desktop-data.* /var/adm/fillup-templates/sysconfig.windowmanager-%name /usr/bin/call-browser ++ desktop-data.tar.bz2 ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 11, line 1 ++ update_rpm ++ --- /var/tmp/diff_new_pack.7RBWny/_old 2014-11-28 08:45:59.0 +0100 +++ /var/tmp/diff_new_pack.7RBWny/_new 2014-11-28 08:45:59.0 +0100 @@ -1,11 +1,10 @@ #! /bin/sh -opwd=$PWD -tdir=`mktemp -d` -cd $tdir || exit 1 -git clone git://gitorious.org/opensuse/desktop-data.git +opwd="$PWD" +trap '[ -n "${tdir}" ] && { cd /; rm -rf -- "${tdir}"; }' EXIT +tdir="$(mktemp -d)" +cd "${tdir}" || exit 1 +git clone https://github.com/openSUSE/desktop-data.git || exit 1 rm desktop-data/update_rpm rm -rf desktop-data/.git -tar -cvj -f $opwd/desktop-data.tar.bz2 desktop-data -cd / -rm -rf $tdir +tar -cvj -f "${opwd}/desktop-data.tar.bz2" desktop-data -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-11-14 09:18:37 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-10-15 16:42:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-11-14 09:18:45.0 +0100 @@ -1,0 +2,5 @@ +Sat Nov 08 04:39:00 UTC 2014 - Led + +- fix bashisms in post script + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.t2a416/_old 2014-11-14 09:18:47.0 +0100 +++ /var/tmp/diff_new_pack.t2a416/_new 2014-11-14 09:18:47.0 +0100 @@ -135,7 +135,9 @@ %post %{fillup_only -an windowmanager} # clean up old susewm menus -/bin/rm -rf etc/opt/kde3/share/applnk/{Settings,SuSE,work} +for i in Settings SuSE work; do + rm -rf /etc/opt/kde3/share/applnk/$i +done %if 0%{?suse_version} > 1130 %icon_theme_cache_post %else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-10-15 16:41:18 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-10-11 19:26:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-10-15 16:42:15.0 +0200 @@ -1,0 +2,8 @@ +Tue Oct 14 17:24:48 UTC 2014 - badshah...@gmail.com + +- Remove etc/skel/Templates directory, there are valid objections + to installing templates this way (see bnc#897716), and this + should be done without installing files to a user's local home + directories. + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.uMUqNW/_old 2014-10-15 16:42:17.0 +0200 +++ /var/tmp/diff_new_pack.uMUqNW/_new 2014-10-15 16:42:17.0 +0200 @@ -167,7 +167,6 @@ /usr/bin/call-browser /usr/bin/desktop-launch /etc/skel/public_html -/etc/skel/Templates/ %dir /etc/kde4 %dir /etc/kde4/kdm %config /etc/kde4/kdm/backgroundrc ++ desktop-data.tar.bz2 ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 4, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-10-11 19:26:00 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-07-31 21:50:00.0 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-10-11 19:26:02.0 +0200 @@ -1,0 +2,10 @@ +Thu Oct 2 19:20:45 UTC 2014 - badshah...@gmail.com + +- Add /etc/skel/Templates directory with templates for commonly + used files: plain text, ODF text, ODF presentation and ODF + drawing. This provides the user with a choice of new document + templates to choose from when, e.g., using the "New Document" + item in right-click menu from file-browsers such as Nautilus; + fixes bnc#897716. + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.TkSqiw/_old 2014-10-11 19:26:05.0 +0200 +++ /var/tmp/diff_new_pack.TkSqiw/_new 2014-10-11 19:26:05.0 +0200 @@ -167,6 +167,7 @@ /usr/bin/call-browser /usr/bin/desktop-launch /etc/skel/public_html +/etc/skel/Templates/ %dir /etc/kde4 %dir /etc/kde4/kdm %config /etc/kde4/kdm/backgroundrc ++ desktop-data.tar.bz2 ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 4, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-07-31 21:49:59 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2014-03-01 21:20:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-07-31 21:50:00.0 +0200 @@ -1,0 +2,7 @@ +Wed Jul 30 07:29:09 UTC 2014 - g...@opensuse.org + +- adapt package-manager.desktop to the removal of + /usr/bin/package-manager, it now only serves as a shortcut to + YaST's package installer (bnc#871978) + +--- Other differences: -- ++ desktop-data.tar.bz2 ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2014-03-01 21:20:37 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2013-09-04 15:52:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2014-03-01 21:20:38.0 +0100 @@ -1,0 +2,5 @@ +Fri Feb 28 06:22:44 UTC 2014 - co...@suse.com + +- bump version to 13.2 + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.A6SQ9s/_old 2014-03-01 21:20:39.0 +0100 +++ /var/tmp/diff_new_pack.A6SQ9s/_new 2014-03-01 21:20:39.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package desktop-data-openSUSE # -# 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 @@ -23,7 +23,7 @@ BuildRequires: update-desktop-files BuildRequires: xdg-menu BuildRequires: xdg-utils -Version:13.1 +Version:13.2 Release:0 Summary:Shared Desktop Files for openSUSE License:GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2013-09-04 15:52:31 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2013-04-24 21:42:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2013-09-04 15:52:32.0 +0200 @@ -1,0 +2,6 @@ +Mon Sep 2 14:30:31 UTC 2013 - co...@suse.com + +- remove supplements and move it to the patterns. Supplements + are rather intransparent + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.TvS2Fb/_old 2013-09-04 15:52:33.0 +0200 +++ /var/tmp/diff_new_pack.TvS2Fb/_new 2013-09-04 15:52:33.0 +0200 @@ -49,8 +49,6 @@ Obsoletes: desktop-data-SuSE <= 11.0 Provides: CheckHardware = 0.1 Obsoletes: gnome2-SuSE <= 10.3 -# BRANDING STUFF -Supplements:packageand(branding-openSUSE:xorg-x11) Provides: desktop-branding = %{version} %description -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2013-04-24 21:42:30 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE", Maintainer is "wstephen...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2013-01-31 14:42:25.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2013-04-24 21:42:34.0 +0200 @@ -1,0 +2,5 @@ +Wed Apr 24 19:11:19 UTC 2013 - co...@suse.com + +- bump version to 13.1 + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.F1eFHh/_old 2013-04-24 21:42:37.0 +0200 +++ /var/tmp/diff_new_pack.F1eFHh/_new 2013-04-24 21:42:37.0 +0200 @@ -23,7 +23,7 @@ BuildRequires: update-desktop-files BuildRequires: xdg-menu BuildRequires: xdg-utils -Version:12.3 +Version:13.1 Release:0 Summary:Shared Desktop Files for openSUSE License:GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2013-01-31 14:42:22 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE", Maintainer is "wstephen...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2013-01-22 15:09:10.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2013-01-31 14:42:25.0 +0100 @@ -1,0 +2,6 @@ +Tue Jan 29 09:41:41 UTC 2013 - wstephen...@suse.com + +- Fix Audio players show up in Video Player submenun (bnc#788628) +- Fix application menu schema warning from kbuildsycoca (bnc#789456) + +--- Other differences: -- ++ desktop-data.tar.bz2 ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2013-01-22 15:09:08 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE", Maintainer is "wstephen...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2012-12-10 11:31:52.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2013-01-22 15:09:10.0 +0100 @@ -1,0 +2,11 @@ +Mon Jan 21 13:10:04 UTC 2013 - wstephen...@suse.com + +- Update for changes to XDG menu spec (bnc#443364): + * Edutainment is now two top level menus, Education and Science + * All additional categories allowed for Education are now +permitted for Science + * Monitor additional category is permitted for System and Network + * Spirituality, Maps, Feed, NetworkService, Shooter additional +categories were added + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.BUOzUe/_old 2013-01-22 15:09:12.0 +0100 +++ /var/tmp/diff_new_pack.BUOzUe/_new 2013-01-22 15:09:12.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package desktop-data-openSUSE # -# 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 ++ desktop-data.tar.bz2 ++ /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2012-12-10 11:31:50 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE", Maintainer is "wstephen...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-12-02 13:21:17.0 +0100 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2012-12-10 11:31:52.0 +0100 @@ -1,0 +2,5 @@ +Mon Dec 10 10:31:26 UTC 2012 - co...@suse.com + +- bump version to 12.3 + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.8t8OPT/_old 2012-12-10 11:31:54.0 +0100 +++ /var/tmp/diff_new_pack.8t8OPT/_new 2012-12-10 11:31:54.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package desktop-data-openSUSE # -# 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 @@ -16,12 +16,15 @@ # - Name: desktop-data-openSUSE -BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils -Version:12.2 +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: perl-RPC-XML +BuildRequires: update-desktop-files +BuildRequires: xdg-menu +BuildRequires: xdg-utils +Version:12.3 Release:0 -%define wallpaper_version 121 Summary:Shared Desktop Files for openSUSE License:GPL-2.0+ Group: System/GUI/Other @@ -32,7 +35,8 @@ PreReq: %fillup_prereq # some soft Requires: Crystalcursors BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: hicolor-icon-theme xdg-utils +Requires: hicolor-icon-theme +Requires: xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors Requires: wallpaper-branding = %{version} @@ -41,8 +45,8 @@ Source2:update_rpm BuildArch: noarch Provides: desktop-data-SuSE = 11.0 -Obsoletes: desktop-data-SuSE <= 11.0 Obsoletes: CheckHardware <= 0.1 +Obsoletes: desktop-data-SuSE <= 11.0 Provides: CheckHardware = 0.1 Obsoletes: gnome2-SuSE <= 10.3 # BRANDING STUFF @@ -54,7 +58,6 @@ applications menu structure and the default wallpaper. %package extra -License:GPL-2.0+ Summary:Additional wallpapers Group: System/GUI/Other Requires: desktop-data-openSUSE -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2011-12-06 18:05:46 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE", Maintainer is "wstephen...@suse.com" Changes: Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.5aAdZV/_old 2011-12-06 18:09:43.0 +0100 +++ /var/tmp/diff_new_pack.5aAdZV/_new 2011-12-06 18:09:43.0 +0100 @@ -23,7 +23,7 @@ Release:0 %define wallpaper_version 121 Summary:Shared Desktop Files for openSUSE -License:GPLv2+ +License:GPL-2.0+ Group: System/GUI/Other Obsoletes: susewm Provides: desktop-data @@ -54,7 +54,7 @@ applications menu structure and the default wallpaper. %package extra -License:GPLv2+ +License:GPL-2.0+ Summary:Additional wallpapers Group: System/GUI/Other Requires: desktop-data-openSUSE -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2011-12-02 13:21:13 Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old) and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new (New) Package is "desktop-data-openSUSE", Maintainer is "wstephen...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-10-18 20:34:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes 2011-12-02 13:21:17.0 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 07:02:26 UTC 2011 - co...@suse.com + +- bump version to 12.2 + +--- Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.7ExVSX/_old 2011-12-02 13:21:20.0 +0100 +++ /var/tmp/diff_new_pack.7ExVSX/_new 2011-12-02 13:21:20.0 +0100 @@ -19,8 +19,8 @@ Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils -Version:12.1 -Release:18 +Version:12.2 +Release:0 %define wallpaper_version 121 Summary:Shared Desktop Files for openSUSE License:GPLv2+ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Wed Oct 12 16:11:39 CEST 2011. --- openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-26 17:02:57.0 +0200 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-10-11 17:09:59.0 +0200 @@ -1,0 +2,7 @@ +Tue Oct 11 14:59:10 UTC 2011 - vu...@opensuse.org + +- Add back Hidden.directory and a mention of it in + applications.menu to help KDE 3 (bnc#686786). +- Drop hidden-fix.diff: the updated fix is now in git. + +--- calling whatdependson for head-i586 Old: hidden-fix.diff Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.UBSLK5/_old 2011-10-12 16:11:35.0 +0200 +++ /var/tmp/diff_new_pack.UBSLK5/_new 2011-10-12 16:11:35.0 +0200 @@ -39,7 +39,6 @@ Source: desktop-data.tar.bz2 Source1:%name.fillup Source2:update_rpm -Patch0: hidden-fix.diff BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: desktop-data-SuSE <= 11.0 @@ -69,7 +68,6 @@ %prep %setup -q -c -%patch0 -p1 %build # Convert KDE style wallpaper desktop files to gnome-wp-list ++ desktop-data.tar.bz2 ++ openSUSE:Factory/desktop-data-openSUSE/desktop-data.tar.bz2 /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data.tar.bz2 differ: char 11, line 1 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 desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Mon Sep 26 17:02:46 CEST 2011. --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-22 18:04:04.0 +0200 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-26 14:34:05.0 +0200 @@ -1,0 +2,6 @@ +Mon Sep 26 12:33:09 UTC 2011 - vu...@opensuse.org + +- Remove update-alternatives Requires(post)/Requires(postun) since + we don't use this anymore (moved to wallpaper-branding-openSUSE). + +--- calling whatdependson for head-i586 Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.G2Mpp0/_old 2011-09-26 17:02:35.0 +0200 +++ /var/tmp/diff_new_pack.G2Mpp0/_new 2011-09-26 17:02:35.0 +0200 @@ -20,7 +20,7 @@ Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version:12.1 -Release:16 +Release:18 %define wallpaper_version 121 Summary:Shared Desktop Files for openSUSE License:GPLv2+ @@ -36,8 +36,6 @@ # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors Requires: wallpaper-branding-openSUSE = %{version} -Requires(post): update-alternatives -Requires(postun): update-alternatives Source: desktop-data.tar.bz2 Source1:%name.fillup Source2:update_rpm Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Fri Sep 23 10:24:07 CEST 2011. --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-21 17:53:54.0 +0200 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-22 18:04:04.0 +0200 @@ -1,0 +2,12 @@ +Thu Sep 22 15:48:46 UTC 2011 - vu...@opensuse.org + +- Drop the bits related to creating the XML file used by GNOME for + the default wallpaper, including the alternatives handling. This + all moves to branding-openSUSE now. + +--- +Thu Sep 22 14:02:08 UTC 2011 - co...@suse.com + +- wallpaper moved out of here, so require it + +--- calling whatdependson for head-i586 Old: desktop-data-openSUSE.xml.in openSUSE-default-static.xml Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.MYkMHu/_old 2011-09-23 10:24:03.0 +0200 +++ /var/tmp/diff_new_pack.MYkMHu/_new 2011-09-23 10:24:03.0 +0200 @@ -35,13 +35,12 @@ Requires: hicolor-icon-theme xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors +Requires: wallpaper-branding-openSUSE = %{version} Requires(post): update-alternatives Requires(postun): update-alternatives Source: desktop-data.tar.bz2 Source1:%name.fillup Source2:update_rpm -Source3:desktop-data-openSUSE.xml.in -Source4:openSUSE-default-static.xml Patch0: hidden-fix.diff BuildArch: noarch Provides: desktop-data-SuSE = 11.0 @@ -75,14 +74,8 @@ %patch0 -p1 %build +# Convert KDE style wallpaper desktop files to gnome-wp-list mkdir -p desktop-data/usr/share/gnome-background-properties -sed "s:@VERSION@:%{version}:g" %SOURCE3 > desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE.xml - -# Check that all files mentioned in openSUSE-default.xml actually exist -for file in `sed "s:<[^>]*>::g" %SOURCE4 | grep /usr`; do -test -f desktop-data/${file} || (echo "${file} is mentioned in %SOURCE4 but does not exist. Please update %SOURCE4, or contact the GNOME team for help."; false ) -done - cat >desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml < @@ -90,27 +83,9 @@ EOF for i in desktop-data/usr/share/wallpapers/*.desktop do -# Convert KDE style wallpaper desktop files to gnome-wp-list -case $i in - # default*.desktop are symlinks for KDE to a real wallpaper. - desktop-data/usr/share/wallpapers/default*.desktop ) - GNOMEXML= - ;; - # the default openSUSE wallpaper is handled differently - desktop-data/usr/share/wallpapers/openSUSE%{wallpaper_version}*.desktop ) - GNOMEXML= IMG=${i#desktop-data} IMG=${IMG%.desktop} - grep -q ${IMG} %SOURCE4 || ( echo "${IMG} not mentioned in %SOURCE4. Please add it there, or contact the GNOME team for help." ; false ) - ;; - *.desktop ) - GNOMEXML=desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml - ;; -esac -if test -n "$GNOMEXML" ; then - IMG=${i#desktop-data} - IMG=${IMG%.desktop} - sed -n >>$GNOMEXML <$i ' + sed -n >>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml <$i ' 1i \ $a \ @@ -125,7 +100,6 @@ ' # And finally delete X-GNOME-WP-* entries, not needed for KDE style desktop files. sed -i '/^X-GNOME-WP-/d' $i -fi done cat >>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml < @@ -133,8 +107,6 @@ %install cp -a desktop-data/* $RPM_BUILD_ROOT/ -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default-static.xml -touch $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default.xml mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged for i in $RPM_BUILD_ROOT/usr/share/desktop-directories/*.directory $RPM_BUILD_ROOT/usr/share/wallpapers/*.desktop do @@ -167,7 +139,6 @@ %{fillup_only -an windowmanager} # clean up old susewm menus /bin/rm -rf etc/opt/kde3/share/applnk/{Settings,SuSE,work} -update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml 5 %if 0%{?suse_version} > 1130 %icon_theme_cache_post %else @@ -175,10 +146,6 @@ %endif %postun -# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed -if [ ! -f /usr/share/wallpapers/openSUSE-default-static.xml ]; then - update-alternatives --remove openSUSE-default.xml
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Thu Sep 22 10:41:43 CEST 2011. --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-06 08:48:26.0 +0200 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-21 17:53:54.0 +0200 @@ -1,0 +2,22 @@ +Wed Sep 21 15:47:30 UTC 2011 - vu...@opensuse.org + +- Update openSUSE-default-static.xml to reference the new filename + for default wallpapers. + +--- +Wed Sep 21 12:50:08 UTC 2011 - co...@suse.com + +- use drops for 12.1 beta + +--- +Tue Sep 20 12:49:17 UTC 2011 - co...@suse.com + +- bump version to 12.1 + +--- +Sun Sep 18 17:17:12 UTC 2011 - jeng...@medozas.de + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) + +--- calling whatdependson for head-i586 Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.Fi42qO/_old 2011-09-22 10:41:38.0 +0200 +++ /var/tmp/diff_new_pack.Fi42qO/_new 2011-09-22 10:41:38.0 +0200 @@ -19,9 +19,9 @@ Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils -Version:11.4 +Version:12.1 Release:16 -%define wallpaper_version 114 +%define wallpaper_version 121 Summary:Shared Desktop Files for openSUSE License:GPLv2+ Group: System/GUI/Other @@ -32,7 +32,6 @@ PreReq: %fillup_prereq # some soft Requires: Crystalcursors BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv:on Requires: hicolor-icon-theme xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors @@ -186,9 +185,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor || true %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %dir /etc/xdg/menus ++ desktop-data.tar.bz2 ++ desktop-data-openSUSE/desktop-data.tar.bz2 /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data.tar.bz2 differ: char 11, line 1 ++ openSUSE-default-static.xml ++ --- /var/tmp/diff_new_pack.Fi42qO/_old 2011-09-22 10:41:38.0 +0200 +++ /var/tmp/diff_new_pack.Fi42qO/_new 2011-09-22 10:41:38.0 +0200 @@ -3,8 +3,8 @@ 864.0 - /usr/share/wallpapers/openSUSE114-1600x1200.jpg - /usr/share/wallpapers/openSUSE114-1920x1200.jpg + /usr/share/wallpapers/openSUSE121-1600x1200.jpg + /usr/share/wallpapers/openSUSE121-1920x1200.jpg Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Mon Sep 12 10:23:40 CEST 2011. --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-02-21 15:35:03.0 +0100 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-06 08:48:26.0 +0200 @@ -1,0 +2,14 @@ +Thu Aug 25 03:28:42 UTC 2011 - badshah...@gmail.com + +- Added package-manager-icon of sizes 64x64, 128x128, 256x256 + and scalable svg (bnc#713902) +- Add post and postun macros to update hicolor icon-theme cache +- Add patch to fix the category of package-manager.desktop file +- Bumped release number + +--- +Tue Apr 12 03:09:07 UTC 2011 - an...@opensuse.org + +- Added patch to fix hidden entries (bnc#686786) + +--- calling whatdependson for head-i586 New: hidden-fix.diff Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.JPuC7w/_old 2011-09-12 10:23:35.0 +0200 +++ /var/tmp/diff_new_pack.JPuC7w/_new 2011-09-12 10:23:35.0 +0200 @@ -15,13 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version:11.4 -Release:15 +Release:16 %define wallpaper_version 114 Summary:Shared Desktop Files for openSUSE License:GPLv2+ @@ -44,6 +43,7 @@ Source2:update_rpm Source3:desktop-data-openSUSE.xml.in Source4:openSUSE-default-static.xml +Patch0: hidden-fix.diff BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: desktop-data-SuSE <= 11.0 @@ -73,6 +73,7 @@ %prep %setup -q -c +%patch0 -p1 %build mkdir -p desktop-data/usr/share/gnome-background-properties @@ -168,12 +169,22 @@ # clean up old susewm menus /bin/rm -rf etc/opt/kde3/share/applnk/{Settings,SuSE,work} update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml 5 +%if 0%{?suse_version} > 1130 +%icon_theme_cache_post +%else +gtk-update-icon-cache %{_datadir}/icons/hicolor || true +%endif %postun # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed if [ ! -f /usr/share/wallpapers/openSUSE-default-static.xml ]; then update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml fi +%if 0%{?suse_version} > 1130 +%icon_theme_cache_postun +%else +gtk-update-icon-cache %{_datadir}/icons/hicolor || true +%endif %clean rm -rf $RPM_BUILD_ROOT ++ desktop-data.tar.bz2 ++ desktop-data-openSUSE/desktop-data.tar.bz2 /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data.tar.bz2 differ: char 11, line 1 ++ hidden-fix.diff ++ diff -Nur /desktop-data.orig/etc/xdg/menus/applications.menu /desktop-data/etc/xdg/menus/applications.menu --- /desktop-data.orig/etc/xdg/menus/applications.menu 2011-02-10 16:05:53.0 +0300 +++ /desktop-data/etc/xdg/menus/applications.menu 2011-04-12 02:16:26.0 +0400 @@ -1300,6 +1300,7 @@ GNOME Settings suse-settings.directory settings.menu + Hidden.directory applications-kmenuedit.menu Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit desktop-data-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Mon Feb 21 17:05:44 CET 2011. --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-02-10 15:18:25.0 +0100 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-02-21 15:35:03.0 +0100 @@ -1,0 +2,12 @@ +Sat Feb 19 10:37:34 CET 2011 - vu...@opensuse.org + +- Rename openSUSE-default.xml to openSUSE-default-static.xml: we'll + use openSUSE-default.xml as a symlink to either this static + version or a dynamic version elsewhere. +- Use update-alternatives to create openSUSE-default.xml in this + package, pointing to openSUSE-default-static.xml. +- Do not repackage openSUSE-default.xml and + openSUSE-default-static.xml in extra subpackage. +- Call %suse_update_desktop_file on package-manager.desktop. + +--- calling whatdependson for head-i586 Old: openSUSE-default.xml New: openSUSE-default-static.xml Other differences: -- ++ desktop-data-openSUSE.spec ++ --- /var/tmp/diff_new_pack.j0NeHO/_old 2011-02-21 17:00:50.0 +0100 +++ /var/tmp/diff_new_pack.j0NeHO/_new 2011-02-21 17:00:50.0 +0100 @@ -21,7 +21,7 @@ Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version:11.4 -Release:3 +Release:15 %define wallpaper_version 114 Summary:Shared Desktop Files for openSUSE License:GPLv2+ @@ -37,11 +37,13 @@ Requires: hicolor-icon-theme xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors +Requires(post): update-alternatives +Requires(postun): update-alternatives Source: desktop-data.tar.bz2 Source1:%name.fillup Source2:update_rpm Source3:desktop-data-openSUSE.xml.in -Source4:openSUSE-default.xml +Source4:openSUSE-default-static.xml BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: desktop-data-SuSE <= 11.0 @@ -131,12 +133,14 @@ %install cp -a desktop-data/* $RPM_BUILD_ROOT/ -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default.xml +install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default-static.xml +touch $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default.xml mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged for i in $RPM_BUILD_ROOT/usr/share/desktop-directories/*.directory $RPM_BUILD_ROOT/usr/share/wallpapers/*.desktop do %suse_update_desktop_file "$i" done +%suse_update_desktop_file package-manager # # define default mouse cursor # @@ -163,6 +167,13 @@ %{fillup_only -an windowmanager} # clean up old susewm menus /bin/rm -rf etc/opt/kde3/share/applnk/{Settings,SuSE,work} +update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml 5 + +%postun +# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed +if [ ! -f /usr/share/wallpapers/openSUSE-default-static.xml ]; then + update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml +fi %clean rm -rf $RPM_BUILD_ROOT @@ -184,7 +195,8 @@ # WARNING: If you modify pattern, you must modify also XML generator pattern. /usr/share/wallpapers/default* /usr/share/wallpapers/openSUSE%{wallpaper_version}* -/usr/share/wallpapers/openSUSE-default.xml +%ghost /usr/share/wallpapers/openSUSE-default.xml +/usr/share/wallpapers/openSUSE-default-static.xml /etc/profile.d/desktop-data.* /var/adm/fillup-templates/sysconfig.windowmanager-%name /usr/bin/call-browser @@ -201,6 +213,7 @@ /usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml %exclude /usr/share/wallpapers/default* %exclude /usr/share/wallpapers/openSUSE%{wallpaper_version}* +%exclude /usr/share/wallpapers/openSUSE-default*.xml /usr/share/wallpapers # FIXME: It should be owned by a different package: %dir /usr/share/gnome-background-properties ++ desktop-data-openSUSE.xml.in ++ --- /var/tmp/diff_new_pack.j0NeHO/_old 2011-02-21 17:00:50.0 +0100 +++ /var/tmp/diff_new_pack.j0NeHO/_new 2011-02-21 17:00:50.0 +0100 @@ -2,7 +2,7 @@ - /usr/share/wallpapers/openSUSE-default.xml + /usr/share/wallpapers/openSUSE-default-static.xml zoom openSUSE @VERSION@ ++ openSUSE-default-static.xml ++ 864.0 /usr/share/wallpapers/openSUSE114-1600x1200.jpg /usr/share/wallpapers/openSUSE114-1920x1200.jpg Re