Accepting request 57378 from X11:xfce

Accepted submit request 57378 from user gberh

OBS-URL: https://build.opensuse.org/request/show/57378
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxfce4ui?expand=0&rev=11
This commit is contained in:
Marcus Rückert 2011-01-14 12:55:46 +00:00 committed by Git OBS Bridge
commit c54169091a
5 changed files with 82 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e001e52220d62133c243a9d092ad13c10a568549b88bb6652dc36d548edd4694
size 442038

View File

@ -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);

3
libxfce4ui-4.7.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d8bc7a8f2fdddc8230a8b32d9196546f9c27fc1adcacd4765c0b430fd641f88
size 443932

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
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
- 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
- improved descriptions
- corrected categories
- removed unsupported locales
- show compiler output
-------------------------------------------------------------------
Sun Dec 5 21:52:35 UTC 2010 - prusnak@opensuse.org

View File

@ -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.
#
@ -15,16 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
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/GUI/XFCE
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)
@ -33,10 +32,12 @@ 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
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 +48,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 +67,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,10 +80,28 @@ 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.
%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
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
@ -84,13 +109,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
@ -106,10 +132,7 @@ 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.*
%dir %{_datadir}/locale/tl_PH
%dir %{_datadir}/locale/tl_PH/LC_MESSAGES
%files -n glade3-catalog-libxfce4ui
%defattr(-, root, root)
@ -130,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