From 2e09612b20194285f838b45442255fc14e3ce4b1337bf4df113da95b1e853722 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 22 Sep 2017 07:09:17 +0000 Subject: [PATCH 1/2] Accepting request 528200 from home:seife:xfce disable gtk-doc build, fails with newer gtk-doc > 1.25 OBS-URL: https://build.opensuse.org/request/show/528200 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=52 --- libxfce4ui.changes | 6 ++++++ libxfce4ui.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index e911d9d..7cc2c2a 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 22 06:45:35 UTC 2017 - seife+obs@b1-systems.com + +- disable gtk-doc build, fails with newer gtk-doc > 1.25 +- do not package ChangeLog, NEWS is enough + ------------------------------------------------------------------- Thu Jun 1 17:35:21 UTC 2017 - zaitor@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 415d820..5659a7d 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -39,7 +39,6 @@ BuildRequires: pkgconfig(gladeui-1.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12 BuildRequires: pkgconfig(libxfconf-0) >= 4.12 @@ -166,7 +165,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --enable-startup-notification \ --with-vendor-info=openSUSE \ - --enable-gtk-doc \ --disable-static make %{?_smp_mflags} V=1 @@ -204,13 +202,13 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %files -n %{libname_gtk2} %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +%doc AUTHORS COPYING NEWS README THANKS TODO %{_libdir}/libxfce4ui-1.so.* %{_libdir}/libxfce4kbd-private-2.so.* %files -n %{libname_gtk3} %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +%doc AUTHORS COPYING NEWS README THANKS TODO %{_libdir}/libxfce4ui-2.so.* %{_libdir}/libxfce4kbd-private-3.so.* From c23e8b3af6aa3d6931b02407ffc137fecd3e32b5491f0f4c33e760fad3eb207d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 23 Sep 2017 18:41:08 +0000 Subject: [PATCH 2/2] Accepting request 528421 from home:seife:xfce correct licenses of libxfce4ui-1-0 and libxfce4ui-2-0 to GPL2.0+ (see decline in https://build.opensuse.org/request/show/528203) OBS-URL: https://build.opensuse.org/request/show/528421 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=53 --- libxfce4ui.changes | 7 +++++++ libxfce4ui.spec | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 7cc2c2a..1e2032c 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 23 18:38:55 UTC 2017 - seife+obs@b1-systems.com + +- correct licenses of libxfce4ui-1-0 and libxfce4ui-2-0 to GPL2.0+, + because files libxfce4kbd-private/xfce-shortcuts-xfwm4.{c,h} are + GPL 2, not LGPL. + ------------------------------------------------------------------- Fri Sep 22 06:45:35 UTC 2017 - seife+obs@b1-systems.com diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 5659a7d..9377da3 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -54,7 +54,7 @@ applications. %package -n %{libname_gtk2} Summary: Widgets Library for the Xfce Desktop Environment # uses exo-open -License: LGPL-2.1+ +License: GPL-2.0+ Group: System/Libraries Requires: exo-tools # -branding only contains keyboard shortcuts for some libxfce4ui consumers so @@ -71,7 +71,7 @@ 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+ +License: GPL-2.0+ Group: System/Libraries Requires: exo-tools # -branding only contains keyboard shortcuts for some libxfce4ui consumers so