From 32ac2c8e4f029cd7def12825920c007fa83640ca7cbf31516f0f65698417d782 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 7 Dec 2010 17:18:21 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/libxfce4ui revision 10.0 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=b62ae9cc0454418bed3b2f901f303914 --- libxfce4ui.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 43449e5..954b53d 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,7 +1,22 @@ # +# spec file for package libxfce4ui (Version 4.7.5) +# +# Copyright (c) 2010 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libxfce4ui Version: 4.7.5 Release: 1 From 2aad1d7bfc016a3b441ec405f99bf5cc6995d4ebe5e3770105692b26af38fdb8 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 24 Dec 2010 12:50:30 +0000 Subject: [PATCH 2/4] - improved descriptions - corrected categories - removed unsupported locales - show compiler output OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=16 --- libxfce4ui.changes | 8 ++++++++ libxfce4ui.spec | 29 ++++++++++++++++++----------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 4a3c37f..790713e 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 24 12:25:06 UTC 2010 - gber@opensuse.org + +- improved descriptions +- corrected categories +- removed unsupported locales +- show compiler output + ------------------------------------------------------------------- Sun Dec 5 21:52:35 UTC 2010 - prusnak@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 954b53d..3fb85bf 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libxfce4ui Version: 4.7.5 Release: 1 License: LGPLv2.1+ Summary: Widgets library for the Xfce desktop environment Url: http://www.xfce.org/ -Group: System/GUI/XFCE +Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 BuildRequires: gtk-doc BuildRequires: intltool @@ -36,7 +34,8 @@ BuildRequires: pkgconfig(libxfconf-0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Widgets and other frequently used functions for the Xfce desktop environment. +The libxfce4ui library provides a number of widgets commonly used by Xfce +applications. %package -n glade3-catalog-libxfce4ui License: LGPLv2.1+ @@ -47,9 +46,11 @@ Requires: glade3 Supplements: packageand(glade3:%{name}-devel) %description -n glade3-catalog-libxfce4ui -Widgets and other frequently used functions for the Xfce desktop environment. +The libxfce4ui library provides a number of widgets commonly used by Xfce +applications. -This package provides a catalog for Glade, to allow the use the Xfce widgets in Glade. +This package provides a catalog for Glade, to allow the use the Xfce widgets in +Glade. %package devel License: LGPLv2.1+ @@ -64,7 +65,11 @@ Requires: pkgconfig(libxfce4util-1.0) Requires: pkgconfig(libxfconf-0) %description devel -Development files for the libxfce4ui library. +The libxfce4ui library provides a number of widgets commonly used by Xfce +applications. + +This package provides development files for developing applications based on +the libxfce4ui library. %package doc License: LGPLv2.1+ @@ -73,7 +78,10 @@ Group: Documentation/HTML Requires: libxfce4ui = %{version} %description doc -Documentation for the libxfce4ui library. +The libxfce4ui library provides a number of widgets commonly used by Xfce +applications. + +This package provides the documentation for the libxfce4ui library. %prep %setup -q @@ -84,13 +92,14 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" --enable-startup-notification \ --enable-gtk-doc \ --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/libglade/2.0/*.la rm -f %{buildroot}%{_libdir}/glade3/modules/*.la +rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} %clean @@ -108,8 +117,6 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml %exclude %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml %{_libdir}/lib*.so.* -%dir %{_datadir}/locale/tl_PH -%dir %{_datadir}/locale/tl_PH/LC_MESSAGES %files -n glade3-catalog-libxfce4ui %defattr(-, root, root) From 58824dd02ccc7789d8da8276b9e451958801905fb8d4da2e7b92480d1b7346ed Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Tue, 4 Jan 2011 19:50:02 +0000 Subject: [PATCH 3/4] - added libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch which fixes a buffer overflow in libxfce4kbd-private that was causing crashes on first startup - updated to 4.7.6 - update default shortcuts for xfce4-display-settings OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=17 --- libxfce4ui-4.7.5.tar.bz2 | 3 --- ...7.6-fix-libxfce4kbd-private-buffer-overflow.patch | 12 ++++++++++++ libxfce4ui-4.7.6.tar.bz2 | 3 +++ libxfce4ui.changes | 10 ++++++++++ libxfce4ui.spec | 6 ++++-- 5 files changed, 29 insertions(+), 5 deletions(-) delete mode 100644 libxfce4ui-4.7.5.tar.bz2 create mode 100644 libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch create mode 100644 libxfce4ui-4.7.6.tar.bz2 diff --git a/libxfce4ui-4.7.5.tar.bz2 b/libxfce4ui-4.7.5.tar.bz2 deleted file mode 100644 index f36d340..0000000 --- a/libxfce4ui-4.7.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e001e52220d62133c243a9d092ad13c10a568549b88bb6652dc36d548edd4694 -size 442038 diff --git a/libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch b/libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch new file mode 100644 index 0000000..e1c4263 --- /dev/null +++ b/libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch @@ -0,0 +1,12 @@ +diff -ur libxfce4ui-4.7.5.orig/libxfce4kbd-private/xfce-shortcuts-provider.c libxfce4ui-4.7.5/libxfce4kbd-private/xfce-shortcuts-provider.c +--- libxfce4ui-4.7.5.orig/libxfce4kbd-private/xfce-shortcuts-provider.c 2010-11-28 15:36:06.000000000 +0100 ++++ libxfce4ui-4.7.5/libxfce4kbd-private/xfce-shortcuts-provider.c 2011-01-04 20:20:22.000000000 +0100 +@@ -255,7 +255,7 @@ + + if (G_UNLIKELY (!already_registered)) + { +- names = g_new0 (const gchar *, length + 1); ++ names = g_new0 (const gchar *, length + 2); + for (i = 0; provider_names != NULL && provider_names[i] != NULL; ++i) + names[i] = provider_names[i]; + names[i++] = xfce_shortcuts_provider_get_name (provider); diff --git a/libxfce4ui-4.7.6.tar.bz2 b/libxfce4ui-4.7.6.tar.bz2 new file mode 100644 index 0000000..43a08cd --- /dev/null +++ b/libxfce4ui-4.7.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d8bc7a8f2fdddc8230a8b32d9196546f9c27fc1adcacd4765c0b430fd641f88 +size 443932 diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 790713e..2232d0c 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 4 16:55:49 UTC 2011 - gber@opensuse.org + +- added + libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch + which fixes a buffer overflow in libxfce4kbd-private that was + causing crashes on first startup +- updated to 4.7.6 + - update default shortcuts for xfce4-display-settings + ------------------------------------------------------------------- Fri Dec 24 12:25:06 UTC 2010 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index 3fb85bf..cfeb647 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -1,5 +1,5 @@ # -# spec file for package libxfce4ui (Version 4.7.5) +# spec file for package libxfce4ui (Version 4.7.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,13 +16,14 @@ # Name: libxfce4ui -Version: 4.7.5 +Version: 4.7.6 Release: 1 License: LGPLv2.1+ Summary: Widgets library for the Xfce desktop environment Url: http://www.xfce.org/ Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 +Patch0: libxfce4ui-4.7.6-fix-libxfce4kbd-private-buffer-overflow.patch BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: pkgconfig(gladeui-1.0) @@ -85,6 +86,7 @@ This package provides the documentation for the libxfce4ui library. %prep %setup -q +%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" From d9e31582e25296db97b09b79bc731c7fc59e2b3d11c78221b775ef911e4905ea Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 5 Jan 2011 18:08:47 +0000 Subject: [PATCH 4/4] - added -branding-upstream subpackage OBS-URL: https://build.opensuse.org/package/show/X11:xfce/libxfce4ui?expand=0&rev=18 --- libxfce4ui.changes | 5 +++++ libxfce4ui.spec | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libxfce4ui.changes b/libxfce4ui.changes index 2232d0c..424acb7 100644 --- a/libxfce4ui.changes +++ b/libxfce4ui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 5 15:07:41 UTC 2011 - gber@opensuse.org + +- added -branding-upstream subpackage + ------------------------------------------------------------------- Tue Jan 4 16:55:49 UTC 2011 - gber@opensuse.org diff --git a/libxfce4ui.spec b/libxfce4ui.spec index cfeb647..e60c87f 100644 --- a/libxfce4ui.spec +++ b/libxfce4ui.spec @@ -32,6 +32,7 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: pkgconfig(libxfconf-0) +Requires: %{name}-branding >= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -84,6 +85,20 @@ applications. This package provides the documentation for the libxfce4ui library. +%package branding-upstream +Summary: Upstream branding of libxfce4ui +License: GPLv2+ +Group: System/GUI/XFCE +# 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(%{name}:branding-upstream) +BuildArch: noarch + +%description branding-upstream +This package provides the openSUSE look and feel for the libxfce4ui library. + %prep %setup -q %patch0 -p1 @@ -117,7 +132,6 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/xdg/xfce4 %dir %{_sysconfdir}/xdg/xfce4/xfconf %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml -%exclude %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml %{_libdir}/lib*.so.* %files -n glade3-catalog-libxfce4ui @@ -139,4 +153,11 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_datadir}/gtk-doc/html/libxfce4ui/ +%files branding-upstream +%defattr(-, root, root) +%dir %{_sysconfdir}/xdg/xfce4 +%dir %{_sysconfdir}/xdg/xfce4/xfconf +%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml +%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml + %changelog