From 90039dda5cf3ac643be37dc781eca8b6474aac5f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:23:51 +0000 Subject: [PATCH 1/5] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 199f60c1e247bec86407216218abb965517c1fe9 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 9 Jun 2007 14:01:55 +0000 Subject: [PATCH 2/5] multilib fix --- xfce4-websearch-plugin-20070428svn2704-multilib.patch | 11 +++++++++++ xfce4-websearch-plugin.spec | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 xfce4-websearch-plugin-20070428svn2704-multilib.patch diff --git a/xfce4-websearch-plugin-20070428svn2704-multilib.patch b/xfce4-websearch-plugin-20070428svn2704-multilib.patch new file mode 100644 index 0000000..8cc622a --- /dev/null +++ b/xfce4-websearch-plugin-20070428svn2704-multilib.patch @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2007-06-09 14:20:46.000000000 +0200 ++++ src/Makefile.in 2007-06-09 14:21:22.000000000 +0200 +@@ -255,7 +255,7 @@ + + desktop_in_in_files = websearch.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(libdir)/xfce4/panel-plugins + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ + $(desktop_in_in_files) diff --git a/xfce4-websearch-plugin.spec b/xfce4-websearch-plugin.spec index fd9545a..bc5a0af 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.5.20070428svn2704%{?dist} +Release: 0.6.20070428svn2704%{?dist} Summary: Websearch plugin from the XFCE panel Group: User Interface/Desktops @@ -11,6 +11,7 @@ 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 +Patch0: %{name}-20070428svn2704-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel @@ -23,9 +24,10 @@ Access searchengines from the XFCE panel. %prep %setup -qn %{name} +./autogen.sh +%patch0 -b .multilib %build -./autogen.sh %configure --disable-static make %{?_smp_mflags} @@ -42,9 +44,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/xfce4/panel-plugins/*.so -%{_datadir}/xfce4/panel-plugins/*.desktop +%{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Jun 09 2007 Christoph Wickert - 0.1.1-0.6.20070428svn2704 +- Multilib fix for desktop file. + * Sat Apr 28 2007 Christoph Wickert - 0.1.1-0.5.20070428svn2704 - Update to svn release 2704 on Xfce 4.4.1 From 235890ffdb6fc7e127dc0ce3154b565617153eb1 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 9 Jun 2007 16:36:05 +0000 Subject: [PATCH 3/5] add bugzilla # to changelog info --- xfce4-websearch-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-websearch-plugin.spec b/xfce4-websearch-plugin.spec index bc5a0af..d2c350d 100644 --- a/xfce4-websearch-plugin.spec +++ b/xfce4-websearch-plugin.spec @@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sat Jun 09 2007 Christoph Wickert - 0.1.1-0.6.20070428svn2704 -- Multilib fix for desktop file. +- Multilib fix for desktop file (#28168). * Sat Apr 28 2007 Christoph Wickert - 0.1.1-0.5.20070428svn2704 - Update to svn release 2704 on Xfce 4.4.1 From a4516d1205fda6df56677e822b5aeffba761403e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:30 +0000 Subject: [PATCH 4/5] 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 f797ba81f636d502222a9c0e1d5029ff4fc2389b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:48:54 +0000 Subject: [PATCH 5/5] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7