From a5434209eaae64959c1d57b8087c32ce62c656d9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:26:02 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for xscope --- 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 b7c1214570ef08b01cb247cd833133c47dace47e Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Thu, 1 Oct 2009 13:04:54 +0000 Subject: [PATCH 2/4] 1.2-1 New upstream release. Drop patches. --- .cvsignore | 2 +- sources | 2 +- xscope.spec | 17 +++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7677556..aa1472a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xscope-1.1.tar.bz2 +xscope-1.2.tar.bz2 diff --git a/sources b/sources index 6e3b841..61148b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c37ec177b56d5909584c1672b6beabd5 xscope-1.1.tar.bz2 +1a9df0ac0dd5a2c2a7948dcf48d126c3 xscope-1.2.tar.bz2 diff --git a/xscope.spec b/xscope.spec index 11ecd2f..4b98b57 100644 --- a/xscope.spec +++ b/xscope.spec @@ -1,21 +1,15 @@ Name: xscope -Version: 1.1 -Release: 4.gitfccbbd6%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: X Window Protocol Viewer Group: User Interface/X License: MIT URL: http://cgit.freedesktop.org/xorg/app/xscope/ Source0: ftp://ftp.freedesktop.org/pub/xorg/individual/app/%{name}-%{version}.tar.bz2 -# git diff --diff-filter=ACMRT xscope-1.1 fccbbd6 -Patch0: xscope-1.1-diff_to_git.patch -# to build on Fedora 10 reduce the xorg-macros required version -Patch1: xscope-1.1-lessmacros.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-xtrans-devel, xorg-x11-proto-devel -# required for the autoreconf -BuildRequires: automake, autoconf, xorg-x11-util-macros %description xscope sits in-between an X11 client and an X11 server and prints the contents @@ -26,10 +20,6 @@ servers and clients. %prep %setup -q -%patch0 -p1 -b .diff_to_git -%patch1 -p1 -b .lessmacros -# required for changes in patch0 and patch1 -autoreconf -f %build %configure @@ -53,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 1 2009 Yanko Kaneti 1.2-1 +- New upstream release. Drop patches. + * Mon Jul 27 2009 Fedora Release Engineering - 1.1-4.gitfccbbd6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 986a130d136a4518f0b98e2905eef1948edb5ad7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:05 +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 e8403f5..91b1dfc 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xscope -# $Id$ +# $Id: Makefile,v 1.1 2009/07/01 02:36:06 tibbs Exp $ NAME := xscope 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 ade1d8c6659fbebd993261773503e6db3397087f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:12:02 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 91b1dfc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xscope -# $Id: Makefile,v 1.1 2009/07/01 02:36:06 tibbs Exp $ -NAME := xscope -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 diff --git a/import.log b/import.log deleted file mode 100644 index 4779ee5..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xscope-1_1-3_gitfccbbd6_fc12:HEAD:xscope-1.1-3.gitfccbbd6.fc12.src.rpm:1246424870