From eaa52436d839e85aaa45ff3630c17510c80e4adb4cbd1ea577f902e2dba1bd50 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 26 Dec 2016 12:56:06 +0000 Subject: [PATCH 1/3] Accepting request 447793 from home:seife:xfce update to 4.13.1 OBS-URL: https://build.opensuse.org/request/show/447793 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=48 --- libxfce4ui-4.12.1.tar.bz2 | 3 --- libxfce4ui-4.13.1.tar.bz2 | 3 +++ libxfce4ui.changes | 12 ++++++++++++ libxfce4ui.spec | 10 +++++----- 4 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 libxfce4ui-4.12.1.tar.bz2 create mode 100644 libxfce4ui-4.13.1.tar.bz2 diff --git a/libxfce4ui-4.12.1.tar.bz2 b/libxfce4ui-4.12.1.tar.bz2 deleted file mode 100644 index b2e9ce5..0000000 --- a/libxfce4ui-4.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43 -size 665624 diff --git a/libxfce4ui-4.13.1.tar.bz2 b/libxfce4ui-4.13.1.tar.bz2 new file mode 100644 index 0000000..4729e04 --- /dev/null +++ b/libxfce4ui-4.13.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a257d73ccf30c1939df2e6ba879c925a1290ae2877a79b27d389e09e01c917d +size 691839 diff --git a/libxfce4ui.changes b/libxfce4ui.changes index e9f37d7..8519968 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Nov 26 13:50:50 UTC 2016 - seife+obs@b1-systems.com + +- update to 4.13.1 + - GTK3 fixes + - new functions + * xfce_widget_reparent + * xfce_titled_dialog_new_with_mixed_buttons + - memory leak and crash fixes + - translation updates + - many more, see ChangeLog file + ------------------------------------------------------------------- Sun Mar 15 22:14:53 UTC 2015 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index cd4841b..1d36a54 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,7 +1,7 @@ # # spec file for package libxfce4ui # -# Copyright (c) 2015 SUSE LINUX 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 @@ -20,13 +20,13 @@ %define libname_gtk3 libxfce4ui-2-0 Name: libxfce4ui -Version: 4.12.1 +Version: 4.13.1 Release: 0 Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries Url: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.12/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.13/%{name}-%{version}.tar.bz2 # needed until all applications have been ported to xfce_dialog_show_help() or # an alternative mechanism Source1: xfhelp4.sh @@ -52,9 +52,9 @@ applications. %package -n %{libname_gtk2} Summary: Widgets Library for the Xfce Desktop Environment +# uses exo-open License: LGPL-2.1+ Group: System/Libraries -# uses exo-open Requires: exo-tools # -branding only contains keyboard shortcuts for some libxfce4ui consumers so # it is not really a dependency but it must be dragged in at a low level @@ -69,9 +69,9 @@ applications. This package provides the GTK 2 variant of libxfce4ui. %package -n %{libname_gtk3} Summary: Widgets Library for the Xfce Desktop Environment +# uses exo-open License: LGPL-2.1+ Group: System/Libraries -# uses exo-open Requires: exo-tools # -branding only contains keyboard shortcuts for some libxfce4ui consumers so # it is not really a dependency but it must be dragged in at a low level From c2d4ca65ab94651c8d35581e939e5fc7f4bf55df77186224774f740e30cfbb99 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 27 Dec 2016 16:24:25 +0000 Subject: [PATCH 2/3] Accepting request 447917 from home:seife:xfce revert to 4.12.1, 4.13 is developer version OBS-URL: https://build.opensuse.org/request/show/447917 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=49 --- libxfce4ui-4.12.1.tar.bz2 | 3 +++ libxfce4ui-4.13.1.tar.bz2 | 3 --- libxfce4ui.changes | 12 ------------ libxfce4ui.spec | 4 ++-- 4 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 libxfce4ui-4.12.1.tar.bz2 delete mode 100644 libxfce4ui-4.13.1.tar.bz2 diff --git a/libxfce4ui-4.12.1.tar.bz2 b/libxfce4ui-4.12.1.tar.bz2 new file mode 100644 index 0000000..b2e9ce5 --- /dev/null +++ b/libxfce4ui-4.12.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43 +size 665624 diff --git a/libxfce4ui-4.13.1.tar.bz2 b/libxfce4ui-4.13.1.tar.bz2 deleted file mode 100644 index 4729e04..0000000 --- a/libxfce4ui-4.13.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a257d73ccf30c1939df2e6ba879c925a1290ae2877a79b27d389e09e01c917d -size 691839 diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 8519968..e9f37d7 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Sat Nov 26 13:50:50 UTC 2016 - seife+obs@b1-systems.com - -- update to 4.13.1 - - GTK3 fixes - - new functions - * xfce_widget_reparent - * xfce_titled_dialog_new_with_mixed_buttons - - memory leak and crash fixes - - translation updates - - many more, see ChangeLog file - ------------------------------------------------------------------- Sun Mar 15 22:14:53 UTC 2015 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 1d36a54..7a40bd6 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -20,13 +20,13 @@ %define libname_gtk3 libxfce4ui-2-0 Name: libxfce4ui -Version: 4.13.1 +Version: 4.12.1 Release: 0 Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries Url: http://www.xfce.org/ -Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.13/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/libxfce4ui/4.12/%{name}-%{version}.tar.bz2 # needed until all applications have been ported to xfce_dialog_show_help() or # an alternative mechanism Source1: xfhelp4.sh From 376040a7e1db72e43500564b08d3e2ddc0d889b76a17024d8efc76dd81678b70 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 1 Jun 2017 18:07:22 +0000 Subject: [PATCH 3/3] Accepting request 500463 from home:Zaitor:branches:X11:xfce Resub, see sr# https://build.opensuse.org/request/show/500433 OBS-URL: https://build.opensuse.org/request/show/500463 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=50 --- libxfce4ui.changes | 7 +++++++ libxfce4ui.spec | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index e9f37d7..e911d9d 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 1 17:35:21 UTC 2017 - zaitor@opensuse.org + +- Add conditional for pkgconfig(gladeui-1.0) BuildRequires and + corresponding subpackage glade3-catalog-libxfce4ui. No longer + build glade integration for Tumbleweed. + ------------------------------------------------------------------- Sun Mar 15 22:14:53 UTC 2015 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 7a40bd6..415d820 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,7 +1,7 @@ # # spec file for package libxfce4ui # -# 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 @@ -33,7 +33,9 @@ Source1: xfhelp4.sh BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files +%if %suse_version < 1330 BuildRequires: pkgconfig(gladeui-1.0) +%endif BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -90,6 +92,7 @@ Group: System/GUI/XFCE %description tools This package provides tools from libxfce4ui. +%if %suse_version < 1330 %package -n glade3-catalog-libxfce4ui Summary: Glade Catalog for libxfce4ui License: LGPL-2.1+ @@ -102,6 +105,7 @@ Supplements: packageand(glade3:%{name}-devel) %description -n glade3-catalog-libxfce4ui This package provides a catalog for Glade which allows the use of the provided Xfce widgets in Glade. +%endif %package devel Summary: Development Files for the libxfce4ui Library @@ -213,11 +217,13 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %files lang -f %{name}.lang %defattr(-,root,root) +%if %suse_version < 1330 %files -n glade3-catalog-libxfce4ui %defattr(-, root, root) %{_libdir}/glade3/modules/libxfce4uiglade.so %{_datadir}/glade3/catalogs/libxfce4ui.xml* %{_datadir}/glade3/pixmaps/hicolor/*/actions/*.png +%endif %files devel %defattr(-, root, root)