From f5010cd462a2343cdffd804efe2998faba4b1e76 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti@fedoraproject.org>
Date: Thu, 1 Oct 2009 12:55:36 +0000
Subject: [PATCH] 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 <yaneti@declera.com> 1.2-1
+- New upstream release. Drop patches.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-4.gitfccbbd6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild