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 - [email protected]
+
+- 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 <[email protected]>
#
# 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
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-EOF
-for i in usr/share/wallpapers/*.desktop
-do
- IMG=${i#desktop-data}
- IMG=${IMG%.desktop}
- sed -n
>>usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml <$i '
- 1i \
- <wallpaper deleted="false">
- $a \
- </wallpaper>
- s@^Name=\(.*\)@ <name>\1</name>@p
- s@^Name\[\([^]]*\)\]=\(.*\)@ <name xml:lang="\1">\2</name>@p
- s@^File=\(.*\)@ <filename>/usr/share/wallpapers/\1</filename>\
- <options>stretched</options>@p
- s@^X-GNOME-WP-Shade-Type=\(.*\)@ <shade_type>\1</shade_type>@p
- s@^X-GNOME-WP-PColor=\(.*\)@ <pcolor>\1</pcolor>@p
- s@^X-GNOME-WP-SColor=\(.*\)@ <scolor>\1</scolor>@p
- '
- # And finally delete X-GNOME-WP-* entries, not needed for KDE style desktop
files.
- sed -i '/^X-GNOME-WP-/d' $i
-done
-cat >>usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
<<EOF
-</wallpapers>
-EOF
+# Keep build empty
%install
-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
+cp -a * %{buildroot}/
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+
+# Update all desktop files
+for i in %{buildroot}%{_datadir}/desktop-directories/*.directory
%{buildroot}%{_datadir}/wallpapers/*.desktop
do
%suse_update_desktop_file "$i"
done
-#
-# define default mouse cursor
-#
-mkdir -p $RPM_BUILD_ROOT%{_fillupdir}/
+
+# Define the default mouse cursor
+mkdir -p %{buildroot}%{_fillupdir}/
install -m 0644 %SOURCE1 \
- $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.windowmanager-%name
-#
-# is it a valid menu ?
-#
-export XDG_DATA_DIRS=$RPM_BUILD_ROOT/usr/share/
-export XDG_CONFIG_DIRS=$RPM_BUILD_ROOT/etc/xdg/
+ %{buildroot}%{_fillupdir}/sysconfig.windowmanager-%name
+
+# Make call-browser executable, symlink
+mkdir -p %{buildroot}%{_bindir}
+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}/
+export XDG_CONFIG_DIRS=%{buildroot}%{_sysconfdir}/xdg/
xdg_menu --die-on-error --format readable
-#
-# make call-browser executable, symlink
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-ln -snf xdg-open $RPM_BUILD_ROOT/usr/bin/call-browser
-ln -snf xdg-open $RPM_BUILD_ROOT/usr/bin/desktop-launch
-#
-# fdupes
-%fdupes $RPM_BUILD_ROOT/usr/share/icons
-%fdupes $RPM_BUILD_ROOT/usr/share/pixmaps
%post
%{fillup_only -an windowmanager}
-# clean up old susewm menus
-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
-gtk-update-icon-cache %{_datadir}/icons/hicolor || true
-%endif
-
-%postun
-%if 0%{?suse_version} > 1130
-%icon_theme_cache_postun
-%else
-gtk-update-icon-cache %{_datadir}/icons/hicolor || true
-%endif
%files
-%defattr(-,root,root)
-%dir /etc/xdg/menus
-%dir /etc/xdg/menus/applications-merged
-%config(noreplace) /etc/xdg/menus/*.menu
-/usr/share/desktop-*
-/usr/share/icons/hicolor/*/*/*
-%dir /usr/share/icons/oxygen
-%dir /usr/share/icons/oxygen/32x32
-%dir /usr/share/icons/oxygen/32x32/apps
-/usr/share/icons/oxygen/*/*/*
-/usr/share/pixmaps/*
-/etc/profile.d/desktop-data.*
+%dir %{_sysconfdir}/xdg/menus
+%dir %{_sysconfdir}/xdg/menus/applications-merged
+%config(noreplace) %{_sysconfdir}/xdg/menus/*.menu
+%config %{_sysconfdir}/profile.d/desktop-data.*
+%{_datadir}/desktop-*
+%{_datadir}/icons/hicolor/*
%{_fillupdir}/sysconfig.windowmanager-%name
-/usr/bin/call-browser
-/usr/bin/desktop-launch
-%dir /etc/kde4
-%dir /etc/kde4/kdm
-%config /etc/kde4/kdm/backgroundrc
+%{_bindir}/call-browser
+%{_bindir}/desktop-launch
%files extra
-%defattr(-,root,root)
-/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
-/usr/share/wallpapers/
-# FIXME: It should be owned by a different package:
-%dir /usr/share/gnome-background-properties
+%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra.xml
+%{_datadir}/wallpapers/
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.zs6w8d/_old 2018-12-27 00:24:04.863923456 +0100
+++ /var/tmp/diff_new_pack.zs6w8d/_new 2018-12-27 00:24:04.863923456 +0100
@@ -3,7 +3,7 @@
<param name="scm">git</param>
<param name="url">git://github.com/openSUSE/desktop-data.git</param>
<param name="filename">desktop-data</param>
- <param name="versionformat">15.0.%cd</param>
+ <param name="versionformat">15.1.%cd</param>
<param name="exclude">update_rpm</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.zs6w8d/_old 2018-12-27 00:24:04.879923443 +0100
+++ /var/tmp/diff_new_pack.zs6w8d/_new 2018-12-27 00:24:04.879923443 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/openSUSE/desktop-data.git</param>
- <param
name="changesrevision">111489469ae031c0d5a89f6b48bfe98f73ed466f</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">0cff8f037295fb83d2e0f3a2e64290b66d2eb221</param></service></servicedata>
\ No newline at end of file
++++++ desktop-data-15.0.20171024.tar.xz -> desktop-data-15.1.20181213.tar.xz
++++++
/work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-15.0.20171024.tar.xz
/work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.28833/desktop-data-15.1.20181213.tar.xz
differ: char 25, line 1
++++++ desktop-data-openSUSE.fillup ++++++
--- /var/tmp/diff_new_pack.zs6w8d/_old 2018-12-27 00:24:04.911923417 +0100
+++ /var/tmp/diff_new_pack.zs6w8d/_new 2018-12-27 00:24:04.911923417 +0100
@@ -1,9 +1,9 @@
-## Type: string
-## Default:
-## Path: Desktop
+## Type: string
+## Default: DMZ-Black
+## Path: Desktop
## Description: default mouse cursor theme
#
# Name of mouse cursor theme for X11. Possible themes can be found
# in /usr/share/icons/
#
-X_MOUSE_CURSOR="DMZ"
+X_MOUSE_CURSOR="DMZ-Black"
