Hello community,
here is the log from the commit of package system-config-printer for
openSUSE:Factory checked in at 2014-09-30 19:36:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/system-config-printer (Old)
and /work/SRC/openSUSE:Factory/.system-config-printer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "system-config-printer"
Changes:
--------
---
/work/SRC/openSUSE:Factory/system-config-printer/system-config-printer.changes
2014-07-21 21:39:37.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.system-config-printer.new/system-config-printer.changes
2014-09-30 19:36:28.000000000 +0200
@@ -1,0 +2,11 @@
+Sun Jul 13 20:21:45 UTC 2014 - dims...@opensuse.org
+
+- Use Adwaita-icon-theme on openSUSE 13.2 (GNOME 3.14):
+ gnome-icon-theme merged the multiple subpackages and was renamed
+ to adwaita-icon-theme. The presence of the icon is responsibility
+ of GTK 3.
+ + Conditional BuildRequires / icon location:
+ - openSUSE > 13.1: adwaita.
+ - openSUSE <= 13.1: gnome.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ system-config-printer.spec ++++++
--- /var/tmp/diff_new_pack.mmGTz5/_old 2014-09-30 19:36:29.000000000 +0200
+++ /var/tmp/diff_new_pack.mmGTz5/_new 2014-09-30 19:36:29.000000000 +0200
@@ -16,6 +16,14 @@
#
+%if 0%{?suse_version} > 1315
+%define _icontheme adwaita
+%define _iconlocation Adwaita
+%else
+%define _icontheme gnome
+%define _iconlocation gnome
+%endif
+
Name: system-config-printer
Version: 1.4.5
Release: 0
@@ -36,11 +44,11 @@
Obsoletes: gnome-cups-manager <= 0.33
BuildRequires: cups-devel
# For directory ownership
+BuildRequires: %{_icontheme}-icon-theme
BuildRequires: dbus-1
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: glib2-devel
-BuildRequires: gnome-icon-theme
# Needed for typelib() requires
BuildRequires: gobject-introspection
# For directory ownership
@@ -158,9 +166,9 @@
%install
%makeinstall udevrulesdir=/usr/lib/udev/rules.d udevhelperdir=/usr/lib/udev
for size in 8x8 16x16 22x22 24x24 32x32 48x48 256x256; do
- if test -f %{_datadir}/icons/gnome/$size/devices/printer.png; then
+ if test -f
%{_datadir}/icons/%{_iconlocation}/$size/devices/printer.png; then
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps
- cp -a %{_datadir}/icons/gnome/$size/devices/printer.png
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/%{name}.png
+ cp -a
%{_datadir}/icons/%{_iconlocation}/$size/devices/printer.png
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/%{name}.png
fi
done
%suse_update_desktop_file print-applet
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
