[xfce4-quicklauncher-plugin] Patch for xfce4-panel 4.7 Update translations from Xfce Transifex

Kevin Fenzi kevin at fedoraproject.org
Wed Jan 12 23:05:57 UTC 2011 

commit 273671627aa39ffed10f2176fc3814f0ec16cbd9
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Wed Jan 12 16:05:27 2011 -0700

    Patch for xfce4-panel 4.7
    Update translations from Xfce Transifex

 xfce4-quicklauncher-plugin-1.9.2-multilib.patch    |   11 --
 ...4-quicklauncher-plugin-1.9.4-desktop-file.patch |   10 --
 ...gin-1.9.4-fix-missing-english-translation.patch |  103 --------------------
 ...uicklauncher-plugin-1.9.4-xfce4-panel-4.7.patch |   26 +++++
 xfce4-quicklauncher-plugin.spec                    |   66 +++++++------
 5 files changed, 60 insertions(+), 156 deletions(-)
---
diff --git a/xfce4-quicklauncher-plugin-1.9.4-xfce4-panel-4.7.patch b/xfce4-quicklauncher-plugin-1.9.4-xfce4-panel-4.7.patch
new file mode 100644
index 0000000..1078ea1
--- /dev/null
+++ b/xfce4-quicklauncher-plugin-1.9.4-xfce4-panel-4.7.patch
@@ -0,0 +1,26 @@
+diff -dur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/Makefile.in xfce4-quicklauncher-plugin-1.9.4/panel-plugin/Makefile.in
+--- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/Makefile.in	2007-06-27 21:07:13.000000000 +0200
++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/Makefile.in	2010-12-19 21:34:32.850758093 +0100
+@@ -238,7 +238,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-plugindir = $(libdir)/xfce4/panel-plugins
++plugindir = $(libdir)/xfce4/panel/plugins
+ plugin_LTLIBRARIES = \
+ 	libquicklauncher.la
+ 
+diff -dur xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in
+--- xfce4-quicklauncher-plugin-1.9.4.orig/panel-plugin/quicklauncher.desktop.in.in	2005-09-25 21:08:43.000000000 +0200
++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/quicklauncher.desktop.in.in	2010-12-19 21:21:03.380661147 +0100
+@@ -1,7 +1,7 @@
+ [Xfce Panel]
+ Type=X-XFCE-PanelPlugin
+-Encoding=UTF-8
+ _Name=Quicklauncher
+ _Comment=Program with several launchers
+-Icon=gnome-fs-executable
+-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
++Icon=application-x-executable
++X-XFCE-Module=quicklauncher
++X-XFCE-Internal=TRUE
diff --git a/xfce4-quicklauncher-plugin.spec b/xfce4-quicklauncher-plugin.spec
index d7ce1e7..dae7c06 100644
--- a/xfce4-quicklauncher-plugin.spec
+++ b/xfce4-quicklauncher-plugin.spec
@@ -1,35 +1,36 @@
-Name:		xfce4-quicklauncher-plugin
-Version:	1.9.4
-Release:	7%{?dist}
-Summary:	Quicklauncher plugin for the Xfce panel
-
-Group:		User Interface/Desktops
-License:	GPLv2+
-URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:	http://www.xfce.org/archive/src/panel-plugins/%{name}/1.9/%{name}-%{version}.tar.bz2
-# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=505165
-# reported to upstream at http://bugzilla.xfce.org/show_bug.cgi?id=5455
-Patch0:		%{name}-1.9.2-multilib.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=509294
-# upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=3540
-Patch1:		%{name}-1.9.4-desktop-file.patch
+%global minor_version 1.9
+
+Name:           xfce4-quicklauncher-plugin
+Version:        1.9.4
+Release:        8%{?dist}
+Summary:        Quicklauncher plugin for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
+# http://bugzilla.xfce.org/show_bug.cgi?id=7015
+Patch1:         %{name}-1.9.4-xfce4-panel-4.7.patch
 # make new apps appear on the correct X screen
 # http://bugzilla.xfce.org/show_bug.cgi?id=4323
-Patch2:		%{name}-1.9.4-fix-multiscreen.patch
+Patch2:         %{name}-1.9.4-fix-multiscreen.patch
 # apply settings without restart
 # http://bugzilla.xfce.org/show_bug.cgi?id=3782
-Patch3:		%{name}-1.9.4-save-settings.patch
+Patch3:         %{name}-1.9.4-save-settings.patch
 # plugin speaks french if no translations are found
 # http://bugzilla.xfce.org/show_bug.cgi?id=3783
-Patch4:		%{name}-1.9.4-fix-missing-english-translation.patch
+# contains all translations from 
+# http://translations.xfce.org/projects/p/xfce4-quicklauncher-plugin/c/master/ 
+# as of 2010-12-19
+Patch4:         %{name}-1.9.4-update-translations.patch
 # Xfce 4.6: xfce-setting-show instead of xfce4-settings-manager
 # http://bugzilla.xfce.org/show_bug.cgi?id=5752
-Patch5:		%{name}-1.9.4-xfce4-settings-manager.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch5:         %{name}-1.9.4-xfce4-settings-manager.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
-BuildRequires:	gettext, perl(XML::Parser)
-Requires:	xfce4-panel >= 4.4.0
+BuildRequires:  xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
+BuildRequires:  gettext, perl(XML::Parser)
+Requires:       xfce4-panel >= 4.4.0
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -37,14 +38,11 @@ them on several lines.
 
 %prep
 %setup -q
-%patch0 -b .multilib
-%patch1 -b .path
-%patch2 -b .multiscreen
-%patch3 -p1 -b .settings
-%patch4 -p1 -b .french
-%if 0%{?fedora} >= 11
-%patch5 -b .xfce46
-%endif
+%patch1 -p1 -b .xfce4-panel-4.7
+%patch2 -p0 -b .multiscreen
+%patch3 -p1 -b .save-settings
+%patch4 -p1 -b .update-translations
+%patch5 -p0 -b .xfce46
 
 %build
 %configure --disable-static
@@ -62,10 +60,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog TODO
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_libdir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Sun Dec 19 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-8
+- Patch for xfce4-panel 4.7
+- Update translations from Xfce Transifex
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.9.4-7
 - Make new apps appear on the correct screen (bugzilla.xfce.org 4323)
 - Apply settings without restarting the plugin (bugzilla.xfce.org #3782)

More information about the scm-commits mailing list