dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xscope-1.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+xscope-1.2.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xscope
-# $Id$
-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
-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)

import.log

@@ -1 +0,0 @@
-xscope-1_1-3_gitfccbbd6_fc12:HEAD:xscope-1.1-3.gitfccbbd6.fc12.src.rpm:1246424870

sources

@@ -1 +1 @@
-c37ec177b56d5909584c1672b6beabd5  xscope-1.1.tar.bz2
+1a9df0ac0dd5a2c2a7948dcf48d126c3  xscope-1.2.tar.bz2

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