From 3314bda119417ac9ac2d5dd96a71c2988e061fcb Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:37:46 +0000 Subject: [PATCH 1/6] Initialize branch FC-6 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..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From bd3b2d6359bf21bbd4c9d5550b917db2228af45b Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 26 Nov 2006 21:49:53 +0000 Subject: [PATCH 2/6] update to 1.4 --- .cvsignore | 2 +- sources | 2 +- xfce4-notes-plugin.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 80392ca..313e00a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.3.99.1.tar.bz2 +xfce4-notes-plugin-1.4.tar.bz2 diff --git a/sources b/sources index 6420f98..683cfa1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e77f1150459d8ab6a1ae0d86af09f44c xfce4-notes-plugin-1.3.99.1.tar.bz2 +5f466f0ccb68b1f14ded77571baa1145 xfce4-notes-plugin-1.4.tar.bz2 diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 13517e6..cc16cdd 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,11 +1,11 @@ Name: xfce4-notes-plugin -Version: 1.3.99.1 -Release: 3%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: Notes plugin for the Xfce panel Group: User Interface/Desktops License: GPL -URL: http://goodies.xfce.org/ +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/xfce4-popup-notes %changelog +* Sun Nov 26 2006 Christoph Wickert - 1.4-1 +- Update to 1.4. + * Thu Oct 05 2006 Christoph Wickert - 1.3.99.1-3 - Bump release for devel checkin. From 00f8658c32cde0e01121eebccfc901ce9f4cf402 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Jan 2007 20:56:55 +0000 Subject: [PATCH 3/6] update to 1.4.1 on Xfce 4.4 --- .cvsignore | 2 +- sources | 2 +- xfce4-notes-plugin.spec | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 313e00a..79e7134 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.4.tar.bz2 +xfce4-notes-plugin-1.4.1.tar.bz2 diff --git a/sources b/sources index 683cfa1..2e9f75e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f466f0ccb68b1f14ded77571baa1145 xfce4-notes-plugin-1.4.tar.bz2 +6f20d84bf3aadd6c974f226c04f33050 xfce4-notes-plugin-1.4.1.tar.bz2 diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index cc16cdd..d139b68 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,5 +1,5 @@ Name: xfce4-notes-plugin -Version: 1.4 +Version: 1.4.1 Release: 1%{?dist} Summary: Notes plugin for the Xfce panel @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.1, libxfcegui4-devel >= 4.3.90.1, libxml2-devel BuildRequires: libXt-devel, gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.1 +Requires: xfce4-panel >= 4.3.99.2 %description This plugin provides sticky notes for your desktop. You can create a note by @@ -39,9 +39,22 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog README TODO %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_bindir}/xfce4-popup-notes +%post +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %changelog +* Mon Jan 22 2007 Christoph Wickert - 1.4.1-1 +- Update to 1.4.1 on Xfce 4.4. + * Sun Nov 26 2006 Christoph Wickert - 1.4-1 - Update to 1.4. From 36b3e74fe9c8b56b75b002d7d3c9e8dcec26d4fa Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 28 Apr 2007 17:15:19 +0000 Subject: [PATCH 4/6] Rebuild for Xfce 4.4.1 --- xfce4-notes-plugin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index d139b68..3279f0d 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-notes-plugin Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Notes plugin for the Xfce panel Group: User Interface/Desktops @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.1, libxfcegui4-devel >= 4.3.90.1, libxml2-devel BuildRequires: libXt-devel, gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.2 +Requires: xfce4-panel >= 4.4.0 %description This plugin provides sticky notes for your desktop. You can create a note by @@ -52,6 +52,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %changelog +* Sat Apr 28 2007 Christoph Wickert - 1.4.1-2 +- Rebuild for Xfce 4.4.1 + * Mon Jan 22 2007 Christoph Wickert - 1.4.1-1 - Update to 1.4.1 on Xfce 4.4. From 54a152f01087584e604afc76c9b900510de9e8aa Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:42 +0000 Subject: [PATCH 5/6] 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 c810457..afb0e5d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/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 3ff54220332bed986292ea9a8e55ea139c33142e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:45:59 +0000 Subject: [PATCH 6/6] 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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6