Hello community, here is the log from the commit of package libxfcegui4 for openSUSE:Factory checked in at 2012-04-17 21:59:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxfcegui4 (Old) and /work/SRC/openSUSE:Factory/.libxfcegui4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxfcegui4", Maintainer is "xfce-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libxfcegui4/libxfcegui4.changes 2011-09-23 02:11:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxfcegui4.new/libxfcegui4.changes 2012-04-17 21:59:57.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Apr 3 21:30:58 UTC 2012 - g...@opensuse.org + +- split into libxfcegui4-4 and libxfcegui4-data in order to + conform to the shared library packaging policy +- renamed libxfcegui4-gladeui to glade3-catalog-libxfce4ui + +------------------------------------------------------------------- +Tue Mar 27 13:52:23 UTC 2012 - g...@opensuse.org + +- added libxfcegui4-use-thunar.patch in order to use Thunar instead + of xftree4 +- added libxfcegui4-fix-menu-icon-name-handling.patch in order to + allow icons with dots in their name (bxo#3614) +- correct dependencies +- split off -lang subpackage + +------------------------------------------------------------------- New: ---- libxfcegui4-fix-menu-icon-name-handling.patch libxfcegui4-use-thunar.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxfcegui4.spec ++++++ --- /var/tmp/diff_new_pack.c3219J/_old 2012-04-17 21:59:58.000000000 +0200 +++ /var/tmp/diff_new_pack.c3219J/_new 2012-04-17 21:59:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libxfcegui4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,68 +16,83 @@ # +%define libname libxfcegui4-4 Name: libxfcegui4 Version: 4.8.1 -Release: 1 -License: LGPL-2.1+ +Release: 0 Summary: Widget Library for the Xfce Desktop Environment -Url: http://www.xfce.org/ +License: LGPL-2.1+ Group: System/Libraries -Source0: %{name}-%{version}.tar.bz2 +Url: http://www.xfce.org/ +Source0: http://archive.xfce.org/src/xfce/libxfcegui4/4.8/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libxfcegui4-use-thunar.patch g...@opensuse.org -- Use Thunar instead of xftree4 +Patch0: libxfcegui4-use-thunar.patch +# PATCH-FIX-UPSTREAM libxfcegui4-fix-menu-icon-name-handling.patch bxo#3614 g...@opensuse.org -- Allow icons with dots in their name +Patch1: libxfcegui4-fix-menu-icon-name-handling.patch BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: pkgconfig(dbus-1) +BuildRequires: update-desktop-files BuildRequires: pkgconfig(gladeui-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libglade-2.0) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libxfce4util-1.0) -BuildRequires: pkgconfig(libxfconf-0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: update-desktop-files +BuildRequires: pkgconfig(sm) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The libxfcegui4 library provides a number of widgets commonly used by Xfce applications. It has been superseded by the libxfce4ui library. +%package -n libxfcegui4-4 +Summary: Widget Library for the Xfce Desktop Environment +Group: System/Libraries +Provides: %{name} = %{version} +Obsoletes: %{name} <= 4.8.1 +Requires: %{name}-data = %{version} +Recommends: %{name}-lang = %{version} + +%description -n libxfcegui4-4 +The libxfcegui4 library provides a number of widgets commonly used by Xfce +applications. It has been superseded by the libxfce4ui library. + +%package data +Summary: Data Files for the libxfcegui4 Library +Group: Development/Libraries/C and C++ +Requires: %{libname} = %{version} +BuildArch: noarch + +%description data +This package provides data files needed by the libxfcegui4 library. + %package devel -License: LGPL-2.1+ Summary: Development Files for the libxfcegui4 Library Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} -Requires: %{name}-gladeui = %{version} -Requires: pkgconfig(dbus-1) -Requires: pkgconfig(gtk+-2.0) -Requires: pkgconfig(libglade-2.0) -Requires: pkgconfig(libstartup-notification-1.0) -Requires: pkgconfig(libxfce4util-1.0) -Requires: pkgconfig(libxfconf-0) -Requires: pkgconfig(libxml-2.0) +Requires: %{libname} = %{version} +Requires: glade3-catalog-libxfcegui4 = %{version} %description devel -The libxfcegui4 library provides a number of widgets commonly used by Xfce -applications. It has been superseded by the libxfce4ui library. - This package provides development files for developing applications based on -the libxfce4ui library. +the libxfcegui4 library. -%package gladeui -License: LGPL-2.1+ -Summary: Glade3 Support for the libxfce4gui Library +%package -n glade3-catalog-libxfcegui4 +Summary: Glade3 Support for the libxfcegui4 Library Group: Development/Libraries/C and C++ +Provides: %{name}-gladeui = %{version} +Obsoletes: %{name}-gladeui <= 4.8.1 +Supplements: packageand(glade3:%{name}-devel) -%description gladeui -The libxfcegui4 library provides a number of widgets commonly used by Xfce -applications. It has been superseded by the libxfce4ui library. - +%description -n glade3-catalog-libxfcegui4 This package provides a catalog for Glade, to allow the use the Xfce widgets in Glade. +%lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -89,49 +104,51 @@ %install %make_install + rm -f %{buildroot}/%{_libdir}/*.la \ %{buildroot}/%{_libdir}/libglade/2.0/*.la \ %{buildroot}/%{_libdir}/glade3/modules/*.la + rm -f %{buildroot}/%{_datadir}/glade3/catalogs/xfce4.xml.in + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang %{name} + +%find_lang %{name} %{?no_lang_C} %clean rm -rf %{buildroot} -%post -/sbin/ldconfig -%if 0%{?suse_version} >= 1140 +%post -n %{libname} -p /sbin/ldconfig + +%postun -n %{libname} -p /sbin/ldconfig + +%post data %icon_theme_cache_post -%endif -%postun -/sbin/ldconfig -%if 0%{?suse_version} >= 1140 +%postun data %icon_theme_cache_postun -%endif -%files -f %{name}.lang +%files -n %{libname} %defattr(-,root,root) %doc AUTHORS COPYING README ChangeLog NEWS -%{_libdir}/*.so.* -%{_libdir}/libglade/*/*.so -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/48x48 -%dir %{_datadir}/icons/hicolor/48x48/apps -%dir %{_datadir}/icons/hicolor/scalable -%dir %{_datadir}/icons/hicolor/scalable/apps +%{_libdir}/libxfcegui4.so.* +%{_libdir}/libglade/*/libxfce4.so + +%files data +%defattr(-,root,root) %{_datadir}/icons/hicolor/*/*/* +%files lang -f %{name}.lang + %files devel %defattr(-, root, root) %doc %{_datadir}/gtk-doc/html/libxfcegui4 %dir %{_includedir}/xfce4 %{_includedir}/xfce4/libxfcegui4/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/* +%{_libdir}/libxfcegui4.so +%{_libdir}/pkgconfig/libxfcegui4-1.0.pc -%files gladeui +%files -n glade3-catalog-libxfcegui4 %defattr(-,root,root) %{_libdir}/glade3/modules/libgladexfce4.so %{_datadir}/glade3/* ++++++ libxfcegui4-fix-menu-icon-name-handling.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 01_fix-menu-icons.dpatch by <gauv...@ulteo.com> ## ## DP: Allows the icon to show up even if there is a dot in its name ## DP: Fixes Xfce #3614 @DPATCH@ Index: libxfcegui4-4.8.1/libxfcegui4/icons.c =================================================================== --- libxfcegui4-4.8.1.orig/libxfcegui4/icons.c +++ libxfcegui4-4.8.1/libxfcegui4/icons.c @@ -142,8 +142,12 @@ xfce_themed_icon_load(const gchar *name, ensure_gtk_icon_theme(); /* GtkIconTheme doesn't like extensions */ - if((p = g_strrstr(name, ".")) && strlen(p) < 6) - name_fixed = g_strndup(name, p-name); + if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg") + || g_str_has_suffix (name, ".xpm")) + { + if((p = g_strrstr(name, ".")) && strlen(p) < 6) + name_fixed = g_strndup(name, p-name); + } pix = gtk_icon_theme_load_icon(icon_theme, name_fixed ? name_fixed : name, size, @@ -220,9 +224,13 @@ xfce_themed_icon_lookup(const gchar *nam ensure_gtk_icon_theme(); /* GtkIconTheme doesn't like extensions */ - if((p = g_strrstr(name, ".")) && strlen(p) < 6) - name_fixed = g_strndup(name, p-name); - + if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg") + || g_str_has_suffix (name, ".xpm")) + { + if((p = g_strrstr(name, ".")) && strlen(p) < 6) + name_fixed = g_strndup(name, p-name); + } + info = gtk_icon_theme_lookup_icon(icon_theme, name_fixed ? name_fixed : name, size, 0); ++++++ libxfcegui4-use-thunar.patch ++++++ Index: libxfcegui4-4.8.1/libxfcegui4/xfce-exec.c =================================================================== --- libxfcegui4-4.8.1.orig/libxfcegui4/xfce-exec.c +++ libxfcegui4-4.8.1/libxfcegui4/xfce-exec.c @@ -226,7 +226,7 @@ xfce_exec_create_argv (const char *cmd, if (in_terminal) argv[0] = g_strdup ("xfterm4"); else - argv[0] = g_strdup ("xftree4"); + argv[0] = g_strdup ("thunar"); argv[1] = realcmd; argv[2] = NULL; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
