Hello community, here is the log from the commit of package xfce4-panel for openSUSE:Factory checked in at 2012-04-19 10:41:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel", Maintainer is "xfce-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel/xfce4-panel.changes 2012-02-21 12:26:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-panel.new/xfce4-panel.changes 2012-04-19 10:41:25.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Apr 4 17:06:49 UTC 2012 - g...@opensuse.org + +- simplify libXext-devel dependency +- fix missing icon + +------------------------------------------------------------------- +Sat Mar 24 22:25:50 UTC 2012 - g...@opensuse.org + +- correct build dependencies +- specfile cleanup +- split off -lang subpackage +- added xfce4-panel-fix-terminal-invocation.patch in order to fix + the invocation of a terminal emulator by the directory menu + plugin (bxo#8018) + +------------------------------------------------------------------- New: ---- xfce4-panel-fix-terminal-invocation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel.spec ++++++ --- /var/tmp/diff_new_pack.CSRrcg/_old 2012-04-19 10:41:26.000000000 +0200 +++ /var/tmp/diff_new_pack.CSRrcg/_new 2012-04-19 10:41:26.000000000 +0200 @@ -16,37 +16,40 @@ # +%define libname libxfce4panel-1_0-3 + Name: xfce4-panel Version: 4.8.6 Release: 0 Summary: Panel for the Xfce Desktop Environment License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/XFCE -Url: http://www.xfce.org/projects/xfce4-panel/ -Source: %{name}-%{version}.tar.bz2 +Url: http://docs.xfce.org/xfce/xfce4-panel/start +Source: http://archive.xfce.org/src/xfce/xfce4-panel/4.8/%{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -BuildRequires: gtk-doc +# PATCH-FIX-UPSTREAM xfce4-panel-fix-terminal-invocation.patch bxo#8018 g...@opensuse.org -- Fixes the invocation of a terminal emulator by the directory menu plugin (backported from upstream git) +Patch0: xfce4-panel-fix-terminal-invocation.patch +BuildRequires: ed BuildRequires: intltool -%if 0%{?suse_version} <= 1210 -BuildRequires: xorg-x11-devel -%else -BuildRequires: libXext-devel -%endif -BuildRequires: perl-XML-Parser +BuildRequires: perl BuildRequires: update-desktop-files BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exo-1) BuildRequires: pkgconfig(garcon-1) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libwnck-1.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) -BuildRequires: pkgconfig(libxfcegui4-1.0) -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxfconf-0) +BuildRequires: pkgconfig(xext) Recommends: %{name}-doc = %{version} -Requires: %{name}-branding >= %{version} +Recommends: %{name}-lang = %{version} +Requires: %{name}-branding = %{version} Provides: xfce4-panel-plugins = %{version} Obsoletes: xfce4-panel-plugins < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,30 +72,21 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: pkgconfig(cairo) -Requires: pkgconfig(exo-1) -Requires: pkgconfig(gtk+-2.0) -Requires: pkgconfig(libstartup-notification-1.0) -Requires: pkgconfig(libwnck-1.0) -Requires: pkgconfig(libxfce4util-1.0) -Requires: pkgconfig(libxfcegui4-1.0) %description devel The xfce4-panel-devel package contains development files needed to to develop panel plugins. -%package -n libxfce4panel-1_0-3 -Summary: Xfce Panel Library +%package -n %{libname} +Summary: Xfce Panel Shared Library License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -%description -n libxfce4panel-1_0-3 -xfce4-panel is the panel for the Xfce desktop environment. - -This package contains the xfce4-panel main library. +%description -n %{libname} +This package contains the xfce4-panel shared library. %package branding-upstream -Summary: Upstream branding for xfce4-panel +Summary: Upstream Branding for xfce4-panel License: GPL-2.0+ Group: System/GUI/XFCE Supplements: packageand(%{name}:branding-upstream) @@ -102,43 +96,53 @@ BuildArch: noarch %description branding-upstream -xfce4-panel is the panel for the XFce desktop environment. +This package provides the upstream look and feel for xfce4-panel. -This package contains the upstream branding. +%lang_package %prep %setup -q +%patch0 -p1 +# fix up missing icon +ed -s plugins/clock/clock.desktop.in 2>/dev/null <<'EOF' +,s/^Icon=office-calendar/Icon=application-x-executable/ +w +EOF %build %configure \ --docdir=%{_datadir}/xfce4/xfce4-panel \ --with-helper-path-prefix=%{_libexecdir} \ - --disable-static \ - --enable-gtk-doc + --disable-static make V=1 %{?_smp_mflags} %install %make_install + rm -f %{buildroot}%{_libdir}/*.la \ %{buildroot}%{_libdir}/xfce4/panel/plugins/*.la \ %{buildroot}%{_datadir}/xfce4/xfce4-panel/README.gtkrc-2.0 + mkdir -p %{buildroot}%{_datadir}/xfce4/panel-plugins mkdir -p %{buildroot}%{_libdir}/xfce4 mkdir -p %{buildroot}%{_libdir}/xfce4/panel-plugins mkdir -p %{buildroot}%{_libexecdir}/xfce4 mkdir -p %{buildroot}%{_libexecdir}/xfce4/panel-plugins + %suse_update_desktop_file panel-desktop-handler %suse_update_desktop_file panel-preferences + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} + %find_lang %{name} %clean rm -rf %{buildroot} -%post -n libxfce4panel-1_0-3 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n libxfce4panel-1_0-3 -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %post %desktop_database_post @@ -148,7 +152,7 @@ %desktop_database_postun %icon_theme_cache_postun -%files -f %{name}.lang +%files %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS docs/README.gtkrc-2.0 %{_bindir}/xfce4-panel @@ -183,22 +187,25 @@ %{_libdir}/xfce4/panel/plugins/liblauncher.so %dir %{_sysconfdir}/xdg/xfce4/panel +%files lang -f %{name}.lang + %files doc %defattr(-,root,root) %dir %{_datadir}/xfce4 %dir %{_datadir}/xfce4/xfce4-panel %doc %{_datadir}/xfce4/xfce4-panel/html/ -%files -n libxfce4panel-1_0-3 +%files -n %{libname} %defattr(-,root,root) -%{_libdir}/libxfce4panel-1.0.so.* +%doc COPYING +%{_libdir}/libxfce4panel-*.so.* %files devel %defattr(-,root,root) -%{_includedir}/xfce4/libxfce4panel-1.0 -%{_libdir}/libxfce4panel-1.0.so -%{_libdir}/pkgconfig/libxfce4panel-1.0.pc -%{_datadir}/gtk-doc/html/libxfce4panel-1.0 +%{_includedir}/xfce4/libxfce4panel-* +%{_libdir}/libxfce4panel-*.so +%{_libdir}/pkgconfig/libxfce4panel-*.pc +%{_datadir}/gtk-doc/html/libxfce4panel-* %files branding-upstream %defattr(-,root,root) ++++++ xfce4-panel-fix-terminal-invocation.patch ++++++ >From fad7e1e6ec57cc9a2b5719e4ef4f09514505b894 Mon Sep 17 00:00:00 2001 From: Nick Schermer <n...@xfce.org> Date: Sun, 23 Oct 2011 16:20:37 +0000 Subject: Directorymenu: Don't pass working dir as argument (bug #8018). --- diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c index ace2a19..b41043e 100644 --- a/plugins/directorymenu/directorymenu.c +++ b/plugins/directorymenu/directorymenu.c @@ -630,7 +630,7 @@ directory_menu_plugin_menu_open (GtkWidget *mi, gchar **binaries = NULL; guint i; gboolean result = FALSE; - gchar *argv[3]; + gchar *argv[2]; /* try to work around the exo code and get the direct command */ rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/helpers.rc", TRUE); @@ -673,8 +673,7 @@ directory_menu_plugin_menu_open (GtkWidget *mi, continue; argv[0] = filename; - argv[1] = working_dir; - argv[2] = NULL; + argv[1] = NULL; /* try to spawn the program, if this fails we try exo for * a decent error message */ -- cgit -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
