Hello community,
here is the log from the commit of package lxappearance-obconf for
openSUSE:Factory checked in at 2013-09-16 10:06:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lxappearance-obconf (Old)
and /work/SRC/openSUSE:Factory/.lxappearance-obconf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxappearance-obconf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lxappearance-obconf/lxappearance-obconf.changes
2012-06-06 16:08:23.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.lxappearance-obconf.new/lxappearance-obconf.changes
2013-09-16 10:06:11.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 13 13:03:33 UTC 2013 - i...@marguerite.su
+
+- fix build with openbox 3.5.2
+- upstream bug sf#3614951
+- add patch: lxappearance-obconf-0.2.0-RrTheme.patch
+
+-------------------------------------------------------------------
New:
----
lxappearance-obconf-0.2.0-RrTheme.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lxappearance-obconf.spec ++++++
--- /var/tmp/diff_new_pack.I6TATw/_old 2013-09-16 10:06:11.000000000 +0200
+++ /var/tmp/diff_new_pack.I6TATw/_new 2013-09-16 10:06:11.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package lxappearance-obconf
#
-# 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
@@ -17,14 +17,15 @@
Name: lxappearance-obconf
+Version: 0.2.0
+Release: 0
Summary: Lxappearance Plugin to Configure Openbox
License: GPL-2.0
Group: System/GUI/LXDE
-Version: 0.2.0
-Release: 0
Url: http://www.lxde.org/
-Source0: %name-%version.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source: %{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM marguer...@opensuse.org - fix build with openbox 3.5.2
+Patch0: lxappearance-obconf-0.2.0-RrTheme.patch
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: pkgconfig(gtk+-2.0)
@@ -33,6 +34,7 @@
BuildRequires: pkgconfig(obt-3.5)
Requires: lxappearance
Requires: openbox
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
ObConf is a program used to configure OpenBox window manager developed
@@ -46,24 +48,24 @@
%prep
%setup -q
+%if 0%{?suse_version} >= 1210
+%patch0 -p1
+%endif
%build
%configure
-%__make %{_smp_mflags} V=1
+make %{?_smp_mflags} V=1
%install
-%makeinstall
-%__rm %buildroot/%_libdir/lxappearance/plugins/*.{a,la}
-%find_lang %name
-
-%clean
-rm -fr %buildroot
+%make_install
+rm %{buildroot}/%{_libdir}/lxappearance/plugins/*.{a,la}
+%find_lang %{name}
-%files -f %name.lang
+%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS CHANGELOG COPYING README
-%_libdir/lxappearance/plugins
-%dir %_datadir/lxappearance/obconf
-%_datadir/lxappearance/obconf/obconf.glade
+%{_libdir}/lxappearance/plugins
+%dir %{_datadir}/lxappearance/obconf
+%{_datadir}/lxappearance/obconf/obconf.glade
%changelog
++++++ lxappearance-obconf-0.2.0-RrTheme.patch ++++++
Index: lxappearance-obconf-0.2.0/src/preview.c
===================================================================
--- lxappearance-obconf-0.2.0.orig/src/preview.c
+++ lxappearance-obconf-0.2.0/src/preview.c
@@ -549,28 +549,28 @@ static GdkPixbuf* preview_window(RrTheme
switch (*layout) {
case 'D':
a = focus ?
- theme->a_focused_unpressed_desk :
- theme->a_unfocused_unpressed_desk;
+ theme->btn_desk->a_focused_unpressed :
+ theme->btn_desk->a_unfocused_unpressed;
break;
case 'S':
a = focus ?
- theme->a_focused_unpressed_shade :
- theme->a_unfocused_unpressed_shade;
+ theme->btn_shade->a_focused_unpressed :
+ theme->btn_shade->a_unfocused_unpressed;
break;
case 'I':
a = focus ?
- theme->a_focused_unpressed_iconify :
- theme->a_unfocused_unpressed_iconify;
+ theme->btn_iconify->a_focused_unpressed :
+ theme->btn_iconify->a_unfocused_unpressed;
break;
case 'M':
a = focus ?
- theme->a_focused_unpressed_max :
- theme->a_unfocused_unpressed_max;
+ theme->btn_max->a_focused_unpressed :
+ theme->btn_max->a_unfocused_unpressed;
break;
case 'C':
a = focus ?
- theme->a_focused_unpressed_close :
- theme->a_unfocused_unpressed_close;
+ theme->btn_close->a_focused_unpressed :
+ theme->btn_close->a_unfocused_unpressed;
break;
default:
continue;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
