From 0da4b46e281d6555e59f45278ffb640c86bbb863551b10ea44abaf44dbcef238 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 1 Mar 2015 21:00:36 +0000 Subject: [PATCH 1/2] Accepting request 288369 from X11:xfce:Next Xfce 4.12 OBS-URL: https://build.opensuse.org/request/show/288369 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=43 --- libxfce4ui-4.10.0.tar.bz2 | 3 -- libxfce4ui-4.12.0.tar.bz2 | 3 ++ libxfce4ui.changes | 46 +++++++++++++++++++++ libxfce4ui.spec | 87 ++++++++++++++++++++++++++------------- 4 files changed, 108 insertions(+), 31 deletions(-) delete mode 100644 libxfce4ui-4.10.0.tar.bz2 create mode 100644 libxfce4ui-4.12.0.tar.bz2 diff --git a/libxfce4ui-4.10.0.tar.bz2 b/libxfce4ui-4.10.0.tar.bz2 deleted file mode 100644 index f06c13a..0000000 --- a/libxfce4ui-4.10.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2 -size 545486 diff --git a/libxfce4ui-4.12.0.tar.bz2 b/libxfce4ui-4.12.0.tar.bz2 new file mode 100644 index 0000000..648ec83 --- /dev/null +++ b/libxfce4ui-4.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:011d9532337a8d0c4d6d2c4dfc854b4f298dbad0e9513b3495a573673b863987 +size 678568 diff --git a/libxfce4ui.changes b/libxfce4ui.changes index fe22b1e..3243a2e 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Sat Feb 28 21:09:15 UTC 2015 - gber@opensuse.org + +- update to version 4.12.0 + - bump version + - translation updates + +------------------------------------------------------------------- +Thu Feb 19 09:52:36 UTC 2015 - gber@opensuse.org + +- update to version 4.11.2 + - bump dependencies versions (autotools, Xfce libraries) + - remove SVN $Id$ tags + - properly quote AC_LANG_SOURCE + - fix autoconf m4 directory warning + - fix IT_PROG_INTLTOOL warning + - fix build with --enable-debug=full and GTK3 (bxo#11176) + - add .gitignore + - fix grabbing shortcuts with modifier (bxo#10373) + - avoid double forking when spawning external apps (bxo#9373) + - don't drop startup notify hint when resetting to defaults + (bxo#10630) + - add l shortcut for screen locking (xflock4) + (bxo#10728) + - fix xfce_dialog_show_help() + +------------------------------------------------------------------- +Wed Apr 30 19:59:18 UTC 2014 - gber@opensuse.org + +- update to version 4.11.1 + - add xfce_dialog_show_help_with_version() so applications can + send their own version number and not the desktop version + - compile GTK+-3 version of libxfce4ui when possible + - depend on GTK 2.24 and Glib 2.28 + - only define distclean files in maintainer mode (bxo#8974) + - don't remove keyboard shortcut when entered twice (bxo#8749) + - fix keyboard shortcuts with Shift modifier (bxo#8744) + - fix alt + print being detected as SysReq (bxo#7897) + - use instead of (bxo#8200) + - fix keyboard shortcuts with keypad (bxo#4178) + - autotools updates + - prefer exo-open for opening the manual pages + - add error domain for XfceSmClient + - translation updates +- add subpackage libxfce4ui-2-0 with the GTK3 variant of libxfce4ui + ------------------------------------------------------------------- Mon Oct 15 11:04:48 UTC 2012 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 4b924c8..3ed5f16 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,7 +1,7 @@ # # spec file for package libxfce4ui # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,27 +16,30 @@ # -%define libname libxfce4ui-1-0 +%define libname_gtk2 libxfce4ui-1-0 +%define libname_gtk3 libxfce4ui-2-0 Name: libxfce4ui -Version: 4.10.0 +Version: 4.12.0 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.10/%{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 -BuildRequires: gtk-doc +BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files 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.9.0 +BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) BuildRequires: pkgconfig(sm) # avoid circular dependency between libxfce4ui and exo @@ -47,7 +50,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build The libxfce4ui library provides a number of widgets commonly used by Xfce applications. -%package -n %{libname} +%package -n %{libname_gtk2} Summary: Widgets Library for the Xfce Desktop Environment License: LGPL-2.1+ Group: System/Libraries @@ -56,13 +59,28 @@ 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 Recommends: %{name}-branding = %{version} +Recommends: %{name}-lang = %{version} Provides: libxfce4ui = %{version} Obsoletes: libxfce4ui <= 4.8.1 + +%description -n %{libname_gtk2} +The libxfce4ui library provides a number of widgets commonly used by Xfce +applications. This package provides the GTK 2 variant of libxfce4ui. + +%package -n %{libname_gtk3} +Summary: Widgets Library for the Xfce Desktop Environment +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 +Recommends: %{name}-branding = %{version} Recommends: %{name}-lang = %{version} -%description -n %{libname} +%description -n %{libname_gtk3} The libxfce4ui library provides a number of widgets commonly used by Xfce -applications. +applications. This package provides the GTK 3 variant of libxfce4ui. %package tools Summary: Tools from libxfce4ui @@ -76,7 +94,8 @@ This package provides tools from libxfce4ui. Summary: Glade Catalog for libxfce4ui License: LGPL-2.1+ Group: Development/Tools/GUI Builders -Requires: %{libname} = %{version} +Requires: %{libname_gtk2} = %{version} +Requires: %{libname_gtk3} = %{version} Requires: glade3 Supplements: packageand(glade3:%{name}-devel) @@ -88,7 +107,8 @@ Xfce widgets in Glade. Summary: Development Files for the libxfce4ui Library License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} +Requires: %{libname_gtk2} = %{version} +Requires: %{libname_gtk3} = %{version} Recommends: %{name}-doc = %{version} %description devel @@ -108,11 +128,12 @@ This package provides the documentation for the libxfce4ui library. Summary: Upstream Branding of libxfce4ui License: GPL-2.0+ Group: System/GUI/XFCE +Supplements: packageand(%{libname_gtk2}:branding-upstream) +Supplements: packageand(%{libname_gtk3}:branding-upstream) # BRAND: xfce4-keyboard-shortcuts.xml: Controls the global keyboard shortcuts # BRAND: for the Xfce desktop. Conflicts: otherproviders(%{name}-branding) Provides: %{name}-branding = %{version} -Supplements: packageand(%{libname}:branding-upstream) BuildArch: noarch %description branding-upstream @@ -123,9 +144,11 @@ This package provides the upstream look and feel for libxfce4ui. Summary: Languages for package %{name} License: LGPL-2.1+ Group: System/Localization -Requires: %{libname} = %{version} +Requires: %{libname_gtk2} = %{version} +Requires: %{libname_gtk3} = %{version} Provides: %{name}-lang-all = %{version} -Supplements: packageand(bundle-lang-other:%{libname}) +Supplements: packageand(bundle-lang-other:%{libname_gtk2}) +Supplements: packageand(bundle-lang-other:%{libname_gtk3}) BuildArch: noarch %description lang @@ -148,9 +171,7 @@ make %{?_smp_mflags} V=1 install -D -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/xfhelp4 -rm -f %{buildroot}%{_libdir}/*.la -rm -f %{buildroot}%{_libdir}/libglade/2.0/*.la -rm -f %{buildroot}%{_libdir}/glade3/modules/*.la +find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file xfce4-about -r X-XFCE X-Xfce-Toplevel @@ -159,12 +180,15 @@ rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} %{?no_lang_C} -%clean -rm -rf %{buildroot} +%fdupes %{buildroot}%{_includedir} -%post -n %{libname} -p /sbin/ldconfig +%post -n %{libname_gtk2} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%postun -n %{libname_gtk2} -p /sbin/ldconfig + +%post -n %{libname_gtk3} -p /sbin/ldconfig + +%postun -n %{libname_gtk3} -p /sbin/ldconfig %post tools %desktop_database_post @@ -174,13 +198,20 @@ rm -rf %{buildroot} %desktop_database_postun %icon_theme_cache_postun -%files -n %{libname} +%files -n %{libname_gtk2} %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO -%{_libdir}/libxfce4ui-*.so.* -%{_libdir}/libxfce4kbd-private-*.so.* +%{_libdir}/libxfce4ui-1.so.* +%{_libdir}/libxfce4kbd-private-2.so.* + +%files -n %{libname_gtk3} +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO +%{_libdir}/libxfce4ui-2.so.* +%{_libdir}/libxfce4kbd-private-3.so.* %files lang -f %{name}.lang +%defattr(-,root,root) %files -n glade3-catalog-libxfce4ui %defattr(-, root, root) @@ -194,10 +225,10 @@ rm -rf %{buildroot} %{_libdir}/libxfce4kbd-private-*.so %{_libdir}/pkgconfig/libxfce4ui-*.pc %{_libdir}/pkgconfig/libxfce4kbd-private-*.pc -%dir %{_includedir}/xfce4/libxfce4ui-1 -%{_includedir}/xfce4/libxfce4ui-1/libxfce4ui/ -%dir %{_includedir}/xfce4/libxfce4kbd-private-2 -%{_includedir}/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/ +%{_includedir}/xfce4/libxfce4ui-1/ +%{_includedir}/xfce4/libxfce4ui-2/ +%{_includedir}/xfce4/libxfce4kbd-private-2/ +%{_includedir}/xfce4/libxfce4kbd-private-3/ %files tools %defattr(-, root, root) From ea5d46633e54018ef0232de5f25eaaac2c794a63821090ae3f381695fb7e6098 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Thu, 5 Mar 2015 12:57:52 +0000 Subject: [PATCH 2/2] Accepting request 288392 from home:Ledest:bashisms More strict BuildRequires OBS-URL: https://build.opensuse.org/request/show/288392 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=44 --- libxfce4ui.changes | 10 ++++++++++ libxfce4ui.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 3243a2e..08ebed0 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Mar 01 21:40:00 UTC 2015 - Led + +- update BuildRequires + +------------------------------------------------------------------- +Sun Mar 01 21:28:00 UTC 2015 - Led + +- update BuildRequires + ------------------------------------------------------------------- Sat Feb 28 21:09:15 UTC 2015 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 3ed5f16..4a86da0 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -39,8 +39,8 @@ 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) -BuildRequires: pkgconfig(libxfconf-0) +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12 +BuildRequires: pkgconfig(libxfconf-0) >= 4.12 BuildRequires: pkgconfig(sm) # avoid circular dependency between libxfce4ui and exo #!BuildIgnore: exo-tools