dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-quicklauncher-plugin
-# $Id$
-NAME := xfce4-quicklauncher-plugin
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch

@@ -0,0 +1,10 @@
+--- panel-plugin/quicklauncher.desktop.in.in.orig	2009-07-04 00:46:34.000000000 +0200
++++ panel-plugin/quicklauncher.desktop.in.in	2009-07-04 00:46:51.000000000 +0200
+@@ -4,4 +4,6 @@
+ _Name=Quicklauncher
+ _Comment=Program with several launchers
+ Icon=gnome-fs-executable
+-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libquicklauncher.so
++X-XFCE-Module=quicklauncher
++X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
++X-XFCE-Unique=false

xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch

@@ -0,0 +1,103 @@
+diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/configure xfce4-quicklauncher-plugin-1.9.4.new/configure
+--- xfce4-quicklauncher-plugin-1.9.4/configure	2007-06-27 21:07:14.000000000 +0200
++++ xfce4-quicklauncher-plugin-1.9.4.new/configure	2008-03-04 22:11:23.000000000 +0100
+@@ -21181,7 +21181,7 @@
+ 
+ 
+ 
+-    ALL_LINGUAS="cs el eu fr gl hu ja pl ru vi"
++    ALL_LINGUAS="cs el en eu fr gl hu ja pl ru vi"
+ 
+ 
+ for ac_header in locale.h
+diff -Nur -x '*.orig' -x '*~' xfce4-quicklauncher-plugin-1.9.4/po/en.po xfce4-quicklauncher-plugin-1.9.4.new/po/en.po
+--- xfce4-quicklauncher-plugin-1.9.4/po/en.po	1970-01-01 01:00:00.000000000 +0100
++++ xfce4-quicklauncher-plugin-1.9.4.new/po/en.po	2008-03-04 22:10:58.000000000 +0100
+@@ -0,0 +1,87 @@
++# English translation of xfce4-quicklauncher-plugin.
++# Copyright (C) 2007 THE xfce4-quicklauncher-plugin'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the xfce4-quicklauncher-plugin package.
++# Jeff Bailes <thepizzaking@gmail.com>, 2007.
++# , fuzzy
++# 
++# 
++msgid ""
++msgstr ""
++"Project-Id-Version: xfce4-quicklauncher-plugin\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2007-05-17 21:37+0200\n"
++"PO-Revision-Date: 2007-03-31 10:17+1000\n"
++"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
++"Language-Team: English\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit"
++
++#: ../panel-plugin/callbacks.c:79
++msgid "Configure Quicklauncher"
++msgstr "Configure Quicklauncher"
++
++#: ../panel-plugin/callbacks.c:93
++msgid "Lines: "
++msgstr "Lines: "
++
++#: ../panel-plugin/callbacks.c:123
++msgid "Espace entre les lanceurs :"
++msgstr "Space between launchers"
++
++#: ../panel-plugin/callbacks.c:131
++msgid "afficher les tooltips"
++msgstr "Show tooltips"
++
++#: ../panel-plugin/callbacks.c:135
++msgid "afficher les labels"
++msgstr "Show labels"
++
++#: ../panel-plugin/callbacks.c:216
++msgid "icone"
++msgstr "icon"
++
++#: ../panel-plugin/callbacks.c:222
++msgid "commande"
++msgstr "command"
++
++#: ../panel-plugin/callbacks.c:228
++msgid "nom"
++msgstr "name"
++
++#: ../panel-plugin/callbacks.c:327
++msgid "Open icon"
++msgstr "Open icon"
++
++#: ../panel-plugin/main.c:163 ../panel-plugin/quicklauncher.desktop.in.in.h:2
++msgid "Quicklauncher"
++msgstr "Quicklauncher"
++
++#: ../panel-plugin/main.c:166
++msgid "Allows you to add launchers easily and display them on many lines."
++msgstr "Allows you to add launchers easily and display them on many lines."
++
++#: ../panel-plugin/main.c:168
++msgid "Other plugins available here"
++msgstr "Other plugins available here"
++
++#: ../panel-plugin/main.c:320
++msgid "Lock"
++msgstr "Lock"
++
++#: ../panel-plugin/main.c:323
++msgid "Parameters"
++msgstr "Parameters"
++
++#: ../panel-plugin/main.c:326
++msgid "Applications"
++msgstr "Applications"
++
++#: ../panel-plugin/main.c:329
++msgid "Help"
++msgstr "Help"
++
++#: ../panel-plugin/quicklauncher.desktop.in.in.h:1
++msgid "Program with several launchers"
++msgstr "Program with several launchers"
++

xfce4-quicklauncher-plugin-1.9.4-fix-multiscreen.patch

@@ -0,0 +1,27 @@
+--- panel-plugin/main.c.org	2008-05-13 09:29:29.000000000 -0600
++++ panel-plugin/main.c	2008-05-13 09:29:33.000000000 -0600
+@@ -148,6 +148,7 @@
+ 	t_qck_launcher_opt_dlg* dlg;
+ 	xfce_panel_plugin_block_menu(plugin);
+ 	dlg = create_qck_launcher_dlg();
++        gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
+ 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
+ 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
+ 	xfce_panel_plugin_unblock_menu(plugin);
+@@ -160,6 +161,7 @@
+ 	GtkWidget *about;
+ 	const gchar* authors[2] = {"Bountykiller <masse_nicolas@yahoo.fr>", NULL};
+ 	about = gtk_about_dialog_new();
++        gtk_window_set_screen (GTK_WINDOW (about), gtk_widget_get_screen (plugin));
+ 	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(about), _("Quicklauncher"));
+ 	gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about), NULL);
+ 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), (const gchar**) authors);
+@@ -461,7 +463,7 @@
+ 		if(launcher->quicklauncher->_last_zoomed_launcher == launcher)
+ 		{
+ 			g_return_val_if_fail(launcher->clicked_img, FALSE);
+-			xfce_exec(launcher->command, FALSE, FALSE, NULL);
++			xfce_exec_on_screen(gtk_widget_get_screen (box), launcher->command, FALSE, FALSE, NULL);
+ 			gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
+ 		}
+ 		else

xfce4-quicklauncher-plugin-1.9.4-save-settings.patch

@@ -0,0 +1,12 @@
+Index: xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c
+===================================================================
+--- xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3779)
++++ xfce4-quicklauncher-plugin-1.9.4/panel-plugin/main.c	(révision 3780)
+@@ -151,6 +151,7 @@
+         gtk_window_set_screen (GTK_WINDOW (dlg->dialog), gtk_widget_get_screen (plugin));
+ 	qck_launcher_opt_dlg_set_quicklauncher(quicklauncher);
+ 	gtk_dialog_run(GTK_DIALOG(dlg->dialog));
++	quicklauncher_save(plugin, quicklauncher);
+ 	xfce_panel_plugin_unblock_menu(plugin);
+ }
+ 

xfce4-quicklauncher-plugin-1.9.4-xfce4-settings-manager.patch

@@ -0,0 +1,11 @@
+--- panel-plugin/main.c.orig	2009-09-09 21:15:01.000000000 +0200
++++ panel-plugin/main.c	2009-09-09 21:23:12.000000000 +0200
+@@ -320,7 +320,7 @@
+ 	launcher = launcher_new(_("Lock"), "xflock4", XFCE_ICON_CATEGORY_SYSTEM,
+ 							NULL, quicklauncher);
+ 	quicklauncher_add_element(quicklauncher, launcher);
+-	launcher = launcher_new(_("Parameters"),"xfce-setting-show", XFCE_ICON_CATEGORY_SETTINGS,
++	launcher = launcher_new(_("Parameters"),"xfce4-settings-manager", XFCE_ICON_CATEGORY_SETTINGS,
+ 							NULL, quicklauncher);
+ 	quicklauncher_add_element(quicklauncher, launcher);
+ 	launcher = launcher_new(_("Applications"), "xfce4-appfinder", XFCE_ICON_CATEGORY_UTILITY,

xfce4-quicklauncher-plugin.spec

@@ -1,13 +1,30 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	1.9.4
-Release:	2%{?dist}
+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://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+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
+# 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
+# apply settings without restart
+# http://bugzilla.xfce.org/show_bug.cgi?id=3782
+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
+# 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)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -21,6 +38,13 @@ 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
 
 %build
 %configure --disable-static
@@ -28,7 +52,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
@@ -42,33 +66,51 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert@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)
+- Add missing english translation (bugzilla.xfce.org #3783)
+- Update default config for Xfce 4.6 (bugzilla.xfce.org #5752)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 03 2009 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.4-5
+- Fix path in desktop file (#509294)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.4-3
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.9.4-2
 - Autorebuild for GCC 4.3
 
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.4-1
+* Sat Aug 25 2007 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.4-1
 - Update to 1.9.4
 - Update license tag
 
-* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-4
+* Sat Jun 09 2007 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.2-4
 - Multilib fix for desktop file (#228168)
 
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-3
+* Sat Apr 28 2007 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.2-3
 - Rebuild for Xfce 4.4.1
 
-* Sun Jan 28 2007 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-2
+* Sun Jan 28 2007 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.2-2
 - Rebuild for Xfce 4.4.
 
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.2-1
+* Thu Oct 05 2006 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.2-1
 - Update to 1.9.2.
 
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.1-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.1-2
 - Rebuild for XFCE 4.3.99.1.
 - BR perl(XML::Parser).
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 1.9.1-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert@fedoraproject.org> - 1.9.1-1
 - Update to 1.9.1 on XFCE 4.3.90.2.
 
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.81-5
+* Mon Sep 04 2006 Christoph Wickert <cwickert@fedoraproject.org> - 0.81-5
 - Mass rebuild for Fedora Core 6.
 
 * Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4