From d16513619c6e2314ad01db7be741d47dc3dde220 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:56:21 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for xfce4-websearch-plugin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 4d7bde12cbdbc1393d6cc6706f1b25b119989c36 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 3 Jul 2009 23:51:01 +0000 Subject: [PATCH 2/4] - Fix path in desktop file (#509294) --- ...arch-plugin-20070428svn2704-desktop-file.patch | 15 +++++++++++++++ xfce4-websearch-plugin.spec | 13 +++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 xfce4-websearch-plugin-20070428svn2704-desktop-file.patch diff --git a/xfce4-websearch-plugin-20070428svn2704-desktop-file.patch b/xfce4-websearch-plugin-20070428svn2704-desktop-file.patch new file mode 100644 index 0000000..c06ece4 --- /dev/null +++ b/xfce4-websearch-plugin-20070428svn2704-desktop-file.patch @@ -0,0 +1,15 @@ +--- src/websearch.desktop.in.in.orig 2009-07-04 01:08:31.000000000 +0200 ++++ src/websearch.desktop.in.in 2009-07-04 01:35:04.000000000 +0200 +@@ -2,6 +2,10 @@ + Type=X-XFCE-PanelPlugin + Encoding=UTF-8 + _Name=WebSearch ++_Name[de]=Web-Suche + _Comment=Search the Web directly from the Panel +-Icon=stock_find +-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libwebsearch.so ++_Comment[de]=Das Internet direkt aus dem Panel heraus durchsuchen ++Icon=gtk-find ++X-XFCE-Module=websearch ++X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@ ++X-XFCE-Unique=false diff --git a/xfce4-websearch-plugin.spec b/xfce4-websearch-plugin.spec index 67edc73..1a12d88 100644 --- a/xfce4-websearch-plugin.spec +++ b/xfce4-websearch-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-websearch-plugin Version: 0.1.1 -Release: 0.10.20070428svn2704%{?dist} +Release: 0.11.20070428svn2704%{?dist} Summary: Websearch plugin from the XFCE panel Group: User Interface/Desktops @@ -11,7 +11,12 @@ URL: http://goodies.xfce.org/ # tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn2704.tar.bz2 xfce4-websearch-plugin Source0: %{name}-20070428svn2704.tar.bz2 #Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz +# 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}-20070428svn2704-multilib.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=509294 +# not yet in Xfce bugzilla, because the websearch component is missing +Patch1: %{name}-20070428svn2704-desktop-file.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel @@ -26,6 +31,7 @@ Access searchengines from the XFCE panel. %setup -qn %{name} ./autogen.sh %patch0 -b .multilib +%patch1 -b .path %build %configure --disable-static @@ -33,7 +39,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} +make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL="install -p" find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %find_lang %{name} @@ -47,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Fri Jul 03 2009 Christoph Wickert - 0.1.1-0.11.20070428svn2704 +- Fix path in desktop file (#509294) + * Thu Feb 26 2009 Fedora Release Engineering - 0.1.1-0.10.20070428svn2704 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 6fd7f8b7f036ac9e654f26027310d7772cee6870 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:30 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 36ff1c8..5b3e9ca 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-websearch-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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 103e9fd9f9ce68fdd7a7f008e432484e0a54b74d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:49:01 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5b3e9ca..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-websearch-plugin -# $Id$ -NAME := xfce4-websearch-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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11