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.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new/desktop-data-openSUSE.changes
2016-02-25 21:42:24.000000000 +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.000000000 +0100
+++ /var/tmp/diff_new_pack.9O43PN/_new 2016-02-25 21:42:26.000000000 +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
<<EOF
+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 desktop-data/usr/share/wallpapers/*.desktop
+for i in usr/share/wallpapers/*.desktop
do
IMG=${i#desktop-data}
IMG=${IMG%.desktop}
- sed -n
>>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 \
<wallpaper deleted="false">
$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
<<EOF
+cat >>usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
<<EOF
</wallpapers>
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 ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://github.com/openSUSE/desktop-data.git</param>
<param name="filename">desktop-data</param>
<param name="version">13.3</param>
<param name="exclude">update_rpm</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>
