From 4129f7e905567340dd53ee86c68bda3d2e4887fc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 02:21:52 +0000 Subject: [PATCH 1/5] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 4fbc1938a38309ea265ff6f6fdd39b753c37ffa6 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 25 May 2008 12:23:05 +0000 Subject: [PATCH 2/5] - Update to 1.6.2 --- .cvsignore | 2 +- sources | 2 +- xfce4-notes-plugin.spec | 25 ++++++++++++++----------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 06fe2ff..6327394 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.6.1.tar.bz2 +xfce4-notes-plugin-1.6.2.tar.gz diff --git a/sources b/sources index 93f7d0d..dce1e22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be2e9006e2a033c722243e4afc1cfc2a xfce4-notes-plugin-1.6.1.tar.bz2 +7c835ad636adeb4d2977e2f34ecda485 xfce4-notes-plugin-1.6.2.tar.gz diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index 9d84850..a307266 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,12 +1,12 @@ Name: xfce4-notes-plugin -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.6.2 +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://goodies.xfce.org/releases/%{name}/%{name}-%{version}.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.90.1, libxfcegui4-devel >= 4.3.90.1, libxml2-devel @@ -35,6 +35,14 @@ make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%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 || : + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO @@ -44,15 +52,10 @@ rm -rf $RPM_BUILD_ROOT %{_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 +* Sat May 24 2008 Christoph Wickert - 1.6.2-1 +- Update to 1.6.2 + * Mon Feb 18 2008 Fedora Release Engineering - 1.6.1-2 - Autorebuild for GCC 4.3 From ff0f56a2ca1ff3260ab07fa6fc635eb1cbad16fe Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Thu, 27 Nov 2008 22:49:38 +0000 Subject: [PATCH 3/5] - Update to 1.6.3 - BR intltool - Update gtk-update-icon-cache scriptlets --- .cvsignore | 2 +- sources | 2 +- xfce4-notes-plugin.spec | 55 +++++++++++++++++++++++++++-------------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6327394..065f8e5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-notes-plugin-1.6.2.tar.gz +xfce4-notes-plugin-1.6.3.tar.bz2 diff --git a/sources b/sources index dce1e22..c38fcf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c835ad636adeb4d2977e2f34ecda485 xfce4-notes-plugin-1.6.2.tar.gz +8a54229eca70f2e2b349401284f920ca xfce4-notes-plugin-1.6.3.tar.bz2 diff --git a/xfce4-notes-plugin.spec b/xfce4-notes-plugin.spec index a307266..0bdb839 100644 --- a/xfce4-notes-plugin.spec +++ b/xfce4-notes-plugin.spec @@ -1,17 +1,17 @@ Name: xfce4-notes-plugin -Version: 1.6.2 +Version: 1.6.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://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.gz +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 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: xfce4-panel-devel >= 4.4.0, libxfcegui4-devel >= 4.4.0, libxml2-devel BuildRequires: Thunar-devel >= 0.8.0 -BuildRequires: gettext, perl(XML::Parser) +BuildRequires: gettext, intltool, perl(XML::Parser) Requires: xfce4-panel >= 4.4.1 %description @@ -20,28 +20,39 @@ clicking on the customizable icon with the middle button of your mouse, show/hide the notes using the left one, edit the titlebar, change the notes background color and much more. + %prep %setup -q + %build %configure --disable-static make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT + %post touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %postun touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + %files -f %{name}.lang %defattr(-,root,root,-) @@ -52,50 +63,56 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_bindir}/xfce4-popup-notes + %changelog -* Sat May 24 2008 Christoph Wickert - 1.6.2-1 +* Thu Nov 27 2008 Christoph Wickert - 1.6.3-1 +- Update to 1.6.3 +- BR intltool +- Update gtk-update-icon-cache scriptlets + +* Sat May 24 2008 Christoph Wickert - 1.6.2-1 - Update to 1.6.2 * Mon Feb 18 2008 Fedora Release Engineering - 1.6.1-2 - Autorebuild for GCC 4.3 -* Sat Dec 29 2007 Christoph Wickert - 1.6.1-1 +* Sat Dec 29 2007 Christoph Wickert - 1.6.1-1 - Update to 1.6.1 - BR Thunar-devel for new file system monitoring feature -* Fri Dec 07 2007 Christoph Wickert - 1.6.0-2 +* Fri Dec 07 2007 Christoph Wickert - 1.6.0-2 - Rebuild for Xfce 4.4.2 -* Sat Nov 24 2007 Christoph Wickert - 1.6.0-1 +* Sat Nov 24 2007 Christoph Wickert - 1.6.0-1 - Update to 1.6.0 -* Sat Aug 25 2007 Christoph Wickert - 1.4.1-3 +* Sat Aug 25 2007 Christoph Wickert - 1.4.1-3 - Rebuild for BuildID feature - Update license tag -* Sat Apr 28 2007 Christoph Wickert - 1.4.1-2 +* 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 +* 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 +* Sun Nov 26 2006 Christoph Wickert - 1.4-1 - Update to 1.4. -* Thu Oct 05 2006 Christoph Wickert - 1.3.99.1-3 +* Thu Oct 05 2006 Christoph Wickert - 1.3.99.1-3 - Bump release for devel checkin. -* Wed Sep 13 2006 Christoph Wickert - 1.3.99.1-2 +* Wed Sep 13 2006 Christoph Wickert - 1.3.99.1-2 - Rebuild for XFCE 4.3.99.1. - BR perl(XML::Parser). -* Thu Sep 07 2006 Christoph Wickert - 1.3.99.1-1 +* Thu Sep 07 2006 Christoph Wickert - 1.3.99.1-1 - Update to 1.3.99.1. -* Mon Sep 04 2006 Christoph Wickert - 1.3.90.2-1 +* Mon Sep 04 2006 Christoph Wickert - 1.3.90.2-1 - Update to 1.3.90.2 on XFCE 4.3.90.2. -* Mon Sep 04 2006 Christoph Wickert - 0.11.1-5 +* Mon Sep 04 2006 Christoph Wickert - 0.11.1-5 - Mass rebuild for Fedora Core 6. * Tue Apr 11 2006 Christoph Wickert - 0.11.1-4 From a1c7860942edecfd670279e24eefd406230e35f8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:41 +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 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 1e70af181935698cb8d41ec992ee4918963ea5f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:45:57 +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 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9