From bdd0343f530691c66eb0be0256190ccc9e8bd509 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:19:35 +0000 Subject: [PATCH 1/5] Initialize branch F-7 for xfce4-datetime-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 6a4f12fe6e1a6706bf3c6b34f87d5dccbeae732e Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 9 Jun 2007 13:26:39 +0000 Subject: [PATCH 2/5] multilib fix --- xfce4-datetime-plugin-0.5.0-multilib.patch | 11 +++++++++++ xfce4-datetime-plugin.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 xfce4-datetime-plugin-0.5.0-multilib.patch diff --git a/xfce4-datetime-plugin-0.5.0-multilib.patch b/xfce4-datetime-plugin-0.5.0-multilib.patch new file mode 100644 index 0000000..9b00cb0 --- /dev/null +++ b/xfce4-datetime-plugin-0.5.0-multilib.patch @@ -0,0 +1,11 @@ +--- panel-plugin/Makefile.in.orig 2007-06-09 13:11:10.000000000 +0200 ++++ panel-plugin/Makefile.in 2007-06-09 13:04:31.000000000 +0200 +@@ -281,7 +281,7 @@ + $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UTIL_LIBS) + +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(libdir)/xfce4/panel-plugins + desktop_in_in_files = datetime.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/xfce4-datetime-plugin.spec b/xfce4-datetime-plugin.spec index 580fe90..21a228a 100644 --- a/xfce4-datetime-plugin.spec +++ b/xfce4-datetime-plugin.spec @@ -1,12 +1,13 @@ Name: xfce4-datetime-plugin Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Date/time plugin for the Xfce panel Group: User Interface/Desktops License: GPL URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-0.5.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.99.2, libxfcegui4-devel >= 4.3.99.2, libxml2-devel @@ -19,6 +20,7 @@ left-click on it. %prep %setup -q +%patch0 -b .multilib %build %configure --disable-static @@ -37,9 +39,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/xfce4/panel-plugins/*.so -%{_datadir}/xfce4/panel-plugins/*.desktop +%{_libdir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Jun 09 2007 Christoph Wickert - 0.5.0-2 +- Multilib fix for desktop file. + * Sat Feb 24 2007 Christoph Wickert - 0.5.0-1 - Update to 0.5.0. From a67ae497ec49b1d57c2c2a71a2af7da1ff2c76e9 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 9 Jun 2007 16:28:17 +0000 Subject: [PATCH 3/5] add bugzilla # to changelog info --- xfce4-datetime-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-datetime-plugin.spec b/xfce4-datetime-plugin.spec index 21a228a..4b7ac1b 100644 --- a/xfce4-datetime-plugin.spec +++ b/xfce4-datetime-plugin.spec @@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sat Jun 09 2007 Christoph Wickert - 0.5.0-2 -- Multilib fix for desktop file. +- Multilib fix for desktop file (#228168). * Sat Feb 24 2007 Christoph Wickert - 0.5.0-1 - Update to 0.5.0. From 1edc6c13337334b7efd43104d7135e07b37d5d79 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:05 +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 0d78fa3..dc0d145 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-datetime-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 d22d74faf0f78c3a0ac8f04663b23d8958aefa69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:43:38 +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 dc0d145..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-datetime-plugin -# $Id$ -NAME := xfce4-datetime-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