From 002a0e5dbbdba3209162d8fbdb403a59548d1ded Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:30:03 +0000 Subject: [PATCH 1/8] Initialize branch F-13 for xfce4-notes-plugin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 72312ab998bcdd38f48e61fb6f986c5ab22f288b Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Wed, 17 Feb 2010 09:55:40 +0000 Subject: [PATCH 2/8] - Add patch to fix DSO linking (#565043) --- xfce4-notes-plugin-1.7.2-dsofix.patch | 12 ++++++++++++ xfce4-notes-plugin.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xfce4-notes-plugin-1.7.2-dsofix.patch diff --git a/xfce4-notes-plugin-1.7.2-dsofix.patch b/xfce4-notes-plugin-1.7.2-dsofix.patch new file mode 100644 index 0000000..0420272 --- /dev/null +++ b/xfce4-notes-plugin-1.7.2-dsofix.patch @@ -0,0 +1,12 @@ +diff -dur xfce4-notes-plugin-1.7.2.orig/panel-plugin/Makefile.in xfce4-notes-plugin-1.7.2/panel-plugin/Makefile.in +--- xfce4-notes-plugin-1.7.2.orig/panel-plugin/Makefile.in 2009-12-19 13:42:03.000000000 +0100 ++++ xfce4-notes-plugin-1.7.2/panel-plugin/Makefile.in 2010-02-17 10:49:31.000000000 +0100 +@@ -234,7 +234,7 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -lm + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 59ecf92..56d8563 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,12 +1,13 @@ Name: xfce4-notes-plugin Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Notes plugin for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2 +Patch0: xfce4-notes-plugin-1.7.2-dsofix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0 @@ -24,6 +25,7 @@ background color and much more. %prep %setup -q +%patch0 -p1 -b .dsofix %build @@ -75,6 +77,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Feb 17 2010 Christoph Wickert - 1.7.2-2 +- Add patch to fix DSO linking (#565043) + * Sun Dec 20 2009 Christoph Wickert - 1.7.2-1 - Update to 1.7.2 - New build dep: unique-devel From 41c45a27b2485d781d7cabdb638bf16d5bb34242 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Mar 2010 13:00:44 +0000 Subject: [PATCH 3/8] - Update to 1.7.3 --- xfce4-notes-plugin-1.7.2-dsofix.patch | 12 ------------ xfce4-notes-plugin-1.7.3-dsofix.patch | 11 +++++++++++ xfce4-notes-plugin.spec | 10 +++++++--- 3 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 xfce4-notes-plugin-1.7.2-dsofix.patch create mode 100644 xfce4-notes-plugin-1.7.3-dsofix.patch diff --git a/xfce4-notes-plugin-1.7.2-dsofix.patch b/xfce4-notes-plugin-1.7.2-dsofix.patch deleted file mode 100644 index 0420272..0000000 --- a/xfce4-notes-plugin-1.7.2-dsofix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur xfce4-notes-plugin-1.7.2.orig/panel-plugin/Makefile.in xfce4-notes-plugin-1.7.2/panel-plugin/Makefile.in ---- xfce4-notes-plugin-1.7.2.orig/panel-plugin/Makefile.in 2009-12-19 13:42:03.000000000 +0100 -+++ xfce4-notes-plugin-1.7.2/panel-plugin/Makefile.in 2010-02-17 10:49:31.000000000 +0100 -@@ -234,7 +234,7 @@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lm - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/xfce4-notes-plugin-1.7.3-dsofix.patch b/xfce4-notes-plugin-1.7.3-dsofix.patch new file mode 100644 index 0000000..313845d --- /dev/null +++ b/xfce4-notes-plugin-1.7.3-dsofix.patch @@ -0,0 +1,11 @@ +--- xfce4-notes-plugin-1.7.3.orig/src/Makefile.in 2010-03-27 09:36:43.000000000 +0100 ++++ xfce4-notes-plugin-1.7.3/src/Makefile.in 2010-03-27 12:31:56.000000000 +0100 +@@ -210,7 +210,7 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -lm + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 56d8563..c43f7ce 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,13 +1,13 @@ Name: xfce4-notes-plugin -Version: 1.7.2 -Release: 2%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: Notes plugin for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2 -Patch0: xfce4-notes-plugin-1.7.2-dsofix.patch +Patch0: xfce4-notes-plugin-1.7.3-dsofix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0 @@ -74,9 +74,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/xfce4/panel-plugins/*.desktop +%{_datadir}/%{name}/ %changelog +* Sat Mar 27 2010 Christoph Wickert - 1.7.3-1 +- Update to 1.7.3 + * Wed Feb 17 2010 Christoph Wickert - 1.7.2-2 - Add patch to fix DSO linking (#565043) From 1caa156fc9c17a0bc68fe23d3686ea8aad4b6ea1 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Mar 2010 13:20:24 +0000 Subject: [PATCH 4/8] update source file --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9283a28..c2d6c13 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.7.2.tar.bz2 +xfce4-notes-plugin-1.7.3.tar.bz2 diff --git a/sources b/sources index 8f99fe1..2817040 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -054742ecc4bb83de6c1447b023938d3e xfce4-notes-plugin-1.7.2.tar.bz2 +0b4ecda1fc35ac98bc8cff56f4d0b4b3 xfce4-notes-plugin-1.7.3.tar.bz2 From cd9634e7713cc51e32682fa45a5edcc078c27232 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 29 Mar 2010 21:22:52 +0000 Subject: [PATCH 5/8] - Update to 1.7.4 - Use exo-open to open URLs (#577548) - Drop patch for DSO linking problems, fixed upstream --- .cvsignore | 2 +- sources | 2 +- xfce4-notes-plugin-1.7.3-dsofix.patch | 11 ----------- xfce4-notes-plugin.spec | 11 +++++++---- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 xfce4-notes-plugin-1.7.3-dsofix.patch diff --git a/.cvsignore b/.cvsignore index c2d6c13..e87ea18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.7.3.tar.bz2 +xfce4-notes-plugin-1.7.4.tar.bz2 diff --git a/sources b/sources index 2817040..34de72a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b4ecda1fc35ac98bc8cff56f4d0b4b3 xfce4-notes-plugin-1.7.3.tar.bz2 +47bd8d19d807a471d9d4d09db2ebafb6 xfce4-notes-plugin-1.7.4.tar.bz2 diff --git a/xfce4-notes-plugin-1.7.3-dsofix.patch b/xfce4-notes-plugin-1.7.3-dsofix.patch deleted file mode 100644 index 313845d..0000000 --- a/xfce4-notes-plugin-1.7.3-dsofix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xfce4-notes-plugin-1.7.3.orig/src/Makefile.in 2010-03-27 09:36:43.000000000 +0100 -+++ xfce4-notes-plugin-1.7.3/src/Makefile.in 2010-03-27 12:31:56.000000000 +0100 -@@ -210,7 +210,7 @@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lm - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index c43f7ce..58dc8d9 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,5 +1,5 @@ Name: xfce4-notes-plugin -Version: 1.7.3 +Version: 1.7.4 Release: 1%{?dist} Summary: Notes plugin for the Xfce panel @@ -7,14 +7,13 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2 -Patch0: xfce4-notes-plugin-1.7.3-dsofix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0 BuildRequires: xfconf-devel >= 4.6.0 BuildRequires: unique-devel BuildRequires: gettext, intltool, desktop-file-utils -Requires: xfce4-panel >= 4.4.1, xfconf >= 4.6.0 +Requires: xfce4-panel >= 4.4.1, xfconf >= 4.6.0, exo %description This plugin provides sticky notes for your desktop. You can create a note by @@ -25,7 +24,6 @@ background color and much more. %prep %setup -q -%patch0 -p1 -b .dsofix %build @@ -78,6 +76,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Mar 29 2010 Mar 27 2010 Christoph Wickert - 1.7.4-1 +- Update to 1.7.4 +- Use exo-open to open URLs (#577548) +- Drop patch for DSO linking problems, fixed upstream + * Sat Mar 27 2010 Christoph Wickert - 1.7.3-1 - Update to 1.7.3 From 3f82c28d6775e0647507996b3a8547d4a2639a5e Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 29 Mar 2010 21:54:13 +0000 Subject: [PATCH 6/8] obviously the DSO linkage problems are not fixed, although upstream said so --- xfce4-notes-plugin-1.7.3-dsofix.patch | 11 +++++++++++ xfce4-notes-plugin.spec | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 xfce4-notes-plugin-1.7.3-dsofix.patch diff --git a/xfce4-notes-plugin-1.7.3-dsofix.patch b/xfce4-notes-plugin-1.7.3-dsofix.patch new file mode 100644 index 0000000..313845d --- /dev/null +++ b/xfce4-notes-plugin-1.7.3-dsofix.patch @@ -0,0 +1,11 @@ +--- xfce4-notes-plugin-1.7.3.orig/src/Makefile.in 2010-03-27 09:36:43.000000000 +0100 ++++ xfce4-notes-plugin-1.7.3/src/Makefile.in 2010-03-27 12:31:56.000000000 +0100 +@@ -210,7 +210,7 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -lm + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 58dc8d9..6974e37 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -7,6 +7,7 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2 +Patch0: xfce4-notes-plugin-1.7.3-dsofix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0 @@ -24,6 +25,7 @@ background color and much more. %prep %setup -q +%patch0 -p1 -b .dsofix %build @@ -79,7 +81,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon Mar 29 2010 Mar 27 2010 Christoph Wickert - 1.7.4-1 - Update to 1.7.4 - Use exo-open to open URLs (#577548) -- Drop patch for DSO linking problems, fixed upstream * Sat Mar 27 2010 Christoph Wickert - 1.7.3-1 - Update to 1.7.3 From 57af6816b9f2e6f406b0f52d0dcfdfb4225a3ab4 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Wed, 31 Mar 2010 00:21:13 +0000 Subject: [PATCH 7/8] - Update to 1.7.6 - Drop DSO linking patch, fixed upstream --- .cvsignore | 2 +- sources | 2 +- xfce4-notes-plugin-1.7.3-dsofix.patch | 11 ----------- xfce4-notes-plugin.spec | 8 +++++--- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 xfce4-notes-plugin-1.7.3-dsofix.patch diff --git a/.cvsignore b/.cvsignore index e87ea18..c8090f8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.7.4.tar.bz2 +xfce4-notes-plugin-1.7.6.tar.bz2 diff --git a/sources b/sources index 34de72a..c071175 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47bd8d19d807a471d9d4d09db2ebafb6 xfce4-notes-plugin-1.7.4.tar.bz2 +a9fff3633f2d0b87f57f4aa93a8a3784 xfce4-notes-plugin-1.7.6.tar.bz2 diff --git a/xfce4-notes-plugin-1.7.3-dsofix.patch b/xfce4-notes-plugin-1.7.3-dsofix.patch deleted file mode 100644 index 313845d..0000000 --- a/xfce4-notes-plugin-1.7.3-dsofix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xfce4-notes-plugin-1.7.3.orig/src/Makefile.in 2010-03-27 09:36:43.000000000 +0100 -+++ xfce4-notes-plugin-1.7.3/src/Makefile.in 2010-03-27 12:31:56.000000000 +0100 -@@ -210,7 +210,7 @@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lm - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 6974e37..2ef2549 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,5 +1,5 @@ Name: xfce4-notes-plugin -Version: 1.7.4 +Version: 1.7.6 Release: 1%{?dist} Summary: Notes plugin for the Xfce panel @@ -7,7 +7,6 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.7/%{name}-%{version}.tar.bz2 -Patch0: xfce4-notes-plugin-1.7.3-dsofix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0 @@ -25,7 +24,6 @@ background color and much more. %prep %setup -q -%patch0 -p1 -b .dsofix %build @@ -78,6 +76,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Mar 31 2010 Christoph Wickert - 1.7.6-1 +- Update to 1.7.6 +- Drop DSO linking patch, fixed upstream + * Mon Mar 29 2010 Mar 27 2010 Christoph Wickert - 1.7.4-1 - Update to 1.7.4 - Use exo-open to open URLs (#577548) From 7baa670858b3ee66e38fa4396b3ac0589efd11e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:45:53 +0000 Subject: [PATCH 8/8] 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 afb0e5d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-notes-plugin -# $Id$ -NAME := xfce4-notes-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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13