From ce9a1a394195f7ab2db47600a775161ff931f7ac Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:21:49 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for xfce4-taskmanager --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 45586f388152bfbb7289d3ab111e85a41360815f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:32:12 +0000 Subject: [PATCH 2/4] 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 213b344..b7105f4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-taskmanager 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 3cf1b5f3d8fb68e5ec7e245edf3d72add536f44e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:47:56 +0000 Subject: [PATCH 3/4] 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 b7105f4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-taskmanager -# $Id$ -NAME := xfce4-taskmanager -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 716c6896bdbbc59044d93ebc1c610d2648a14a7a Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 1 Aug 2010 12:51:12 +0200 Subject: [PATCH 4/4] initial build for el6 --- .gitignore | 2 +- sources | 2 +- xfce4-taskmanager.spec | 24 ++++++++++++++---------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 49e383d..2fab4f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -xfce4-taskmanager-0.4.1.tar.bz2 +xfce4-taskmanager-1.0.0.tar.bz2 diff --git a/sources b/sources index f3c2268..b9709d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ed599faf6b734b2d2e7be16adf0b2d9 xfce4-taskmanager-0.4.1.tar.bz2 +cd205366ae771d2cbe72b5ca7b1257b0 xfce4-taskmanager-1.0.0.tar.bz2 diff --git a/xfce4-taskmanager.spec b/xfce4-taskmanager.spec index 43bbb1b..ef8005b 100644 --- a/xfce4-taskmanager.spec +++ b/xfce4-taskmanager.spec @@ -1,12 +1,14 @@ +%global majorversion 1.0 + Name: xfce4-taskmanager -Version: 0.4.1 -Release: 3%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Taskmanager for the Xfce desktop environment Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/applications/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/apps/%{name}/%{majorversion}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfcegui4-devel >= 4.4 @@ -18,12 +20,6 @@ A simple taskmanager for the Xfce desktop environment. %prep %setup -q -# convert ChangeLog and THANKS to UTF-8 to make rpmlint happy -for file in ChangeLog THANKS; do - mv $file timestamp - iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp - touch -r timestamp $file -done %build @@ -41,7 +37,6 @@ desktop-file-install --vendor fedora \ --add-category GTK \ --add-category Monitor \ --add-category X-Xfce \ - --remove-category Application \ --remove-category Utility \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -59,6 +54,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 15 2010 Christoph Wickert - 1.0.0-1 +- Update to 1.0.0 final + +* Sun Jun 06 2010 Christoph Wickert - 0.5.92-1 +- Update to 0.5.91 (0.6 Beta 3) + +* Tue May 25 2010 Christoph Wickert - 0.5.91-1 +- Update to 0.5.91 (0.6 Beta 2) + * Thu Jul 30 2009 Christoph Wickert - 0.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild