From ad4fb97d3d7f128c91cf3279749d3587a6b5351c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 01:23:30 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for wmctrl --- 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 6dcb6b1b5093df1fc15f0f54c395f5e4ccacf066 Mon Sep 17 00:00:00 2001 From: pertusus Date: Sun, 28 Sep 2008 13:04:52 +0000 Subject: [PATCH 2/4] - apply debian patcheset, to fix #426383 --- .cvsignore | 1 + sources | 1 + wmctrl.spec | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 55d4b85..3471b8a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ wmctrl-1.07.tar.gz +wmctrl_1.07-6.diff.gz diff --git a/sources b/sources index 1fa10c5..3b52946 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 1fe3c7a2caa6071e071ba34f587e1555 wmctrl-1.07.tar.gz +7ddf2aadc48f4300c16160b3c9a7e141 wmctrl_1.07-6.diff.gz diff --git a/wmctrl.spec b/wmctrl.spec index 5fb4fcc..8253c38 100644 --- a/wmctrl.spec +++ b/wmctrl.spec @@ -1,12 +1,13 @@ Name: wmctrl Version: 1.07 -Release: 3%{?dist} +Release: 5%{?dist} Summary: A command line tool to interact with an X Window Manager Group: User Interface/X -License: GPL +License: GPLv2+ URL: http://sweb.cz/tripie/utils/wmctrl Source0: http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz +Patch0: http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_1.07-6.diff.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel, libXmu-devel, glib2-devel @@ -25,6 +26,10 @@ BuildRequires: xorg-x11-proto-devel, libXmu-devel, glib2-devel %prep %setup -q +%patch0 -p1 +iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8 +touch -c -r ChangeLog ChangeLog.utf8 +mv ChangeLog.utf8 ChangeLog %build %configure @@ -48,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 28 2008 Patrice Dumas - 1.07-5 +- apply debian patcheset, to fix #426383 + +* Sat Sep 6 2008 Tom "spot" Callaway 1.07-4 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 1.07-3 - Autorebuild for GCC 4.3 From 3b72fea682df3f0ddde020cb062b275a68e592ed Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:17:50 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b2ca2e..8c77b9e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wmctrl -# $Id$ +# $Id: Makefile,v 1.1 2006/10/07 05:15:43 errr Exp $ NAME := wmctrl 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 175fbaf8426aba0af5dcd6cb3544481148c7a4b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:22:59 +0000 Subject: [PATCH 4/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 8c77b9e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wmctrl -# $Id: Makefile,v 1.1 2006/10/07 05:15:43 errr Exp $ -NAME := wmctrl -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