From 7ece4eb4ad19003bba2ad6a8e67acb99960e3705 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:39:14 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 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..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 80c631cc81ff8a5726ac05c1beeea4b0aaa912e6 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Jan 2007 23:37:05 +0000 Subject: [PATCH 2/5] rebuild for xfce 4.4 --- xfce4-websearch-plugin.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xfce4-websearch-plugin.spec b/xfce4-websearch-plugin.spec index c9ba16c..c518aea 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.2.20060923svn%{?dist} +Release: 0.3.20060923svn%{?dist} Summary: Websearch plugin from the XFCE panel Group: User Interface/Desktops @@ -42,10 +42,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/xfce4/panel-plugins/*.so -#%{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Mon Jan 22 2007 Christoph Wickert - 0.1.1-0.3.20060923svn +- Rebuild on Xfce 4.4. + * Thu Oct 05 2006 Christoph Wickert - 0.1.1-0.2.20060923svn - Bump release for devel checkin. From c534e9071f11f5bcccde6bdb8c1786086ad48c9c Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 28 Apr 2007 21:16:14 +0000 Subject: [PATCH 3/5] Rebuild for Xfce 4.4.1 --- .cvsignore | 2 +- sources | 2 +- xfce4-websearch-plugin.spec | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 680b3f1..272e8b3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-websearch-plugin-20060923svn.tar.bz2 +xfce4-websearch-plugin-20070428svn2704.tar.bz2 diff --git a/sources b/sources index 88145e3..522f9e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69931a7b4f4181bb80e2eca6c080649a xfce4-websearch-plugin-20060923svn.tar.bz2 +f72c0eb5dc42ea4aa709aaf0656b666c xfce4-websearch-plugin-20070428svn2704.tar.bz2 diff --git a/xfce4-websearch-plugin.spec b/xfce4-websearch-plugin.spec index c518aea..fd9545a 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.3.20060923svn%{?dist} +Release: 0.5.20070428svn2704%{?dist} Summary: Websearch plugin from the XFCE panel Group: User Interface/Desktops @@ -8,15 +8,15 @@ License: GPL URL: http://goodies.xfce.org/ # Source0 was generated with the following commands: # svn co http://svn.xfce.org/svn/goodies/xfce4-websearch-plugin/trunk xfce4-websearch-plugin -# tar -cjf xfce4-websearch-plugin-`date +%G%m%d`svn.tar.bz2 xfce4-websearch-plugin -Source0: %{name}-20060923svn.tar.bz2 +# 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.0, libxfcegui4-devel >= 4.3.0, libxml2-devel BuildRequires: gettext BuildRequires: xfce4-dev-tools >= 4.3.90.2 -Requires: xfce4-panel >= 4.3.99.1 +Requires: xfce4-panel >= 4.4.0 %description Access searchengines from the XFCE panel. @@ -45,6 +45,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Apr 28 2007 Christoph Wickert - 0.1.1-0.5.20070428svn2704 +- Update to svn release 2704 on Xfce 4.4.1 + +* Tue Mar 20 2007 Christoph Wickert - 0.1.1-0.4.20070128svn2458 +- Update to svn release 2458. + * Mon Jan 22 2007 Christoph Wickert - 0.1.1-0.3.20060923svn - Rebuild on Xfce 4.4. From 0329e02abe73f1b78c2149fdf2d1aac60944dac4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:31 +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 240fa90b45cf464aa89d59d283ae719f9c66b1a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:49:02 +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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6