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 cd4841b..415d820 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) 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) @@ -52,9 +54,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 +71,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 @@ -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)