dist-git conversion

- Remove unnecessary libXau-devel BuildRequires.
Fix typo that causes a failure to update the common directory. (releng
2010-07-29 17:39:03 +00:00 · 2010-02-02 06:48:51 +00:00 · 2009-11-26 01:55:56 +00:00 · 2009-10-06 17:28:49 +00:00 · 2009-09-29 05:17:24 +00:00
5 changed files with 14 additions and 31 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: libXi
-# $Id: Makefile,v 1.1 2005/08/26 21:27:45 mharris Exp $
-NAME := libXi
-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),)
-# attempt 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)
--- a/import.log
+++ b/import.log
@ -1 +0,0 @@
-libXi-1_2_0-1_fc11:HEAD:libXi-1.2.0-1.fc11.src.rpm:1228320319
--- a/libXi.spec
+++ b/libXi.spec
@ -1,17 +1,17 @@
 %define tarball libXi
-%define gitdate 20090825
+#define gitdate 20090825

 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.2.99
-Release: 11.%{gitdate}%{?dist}
+Version: 1.3
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+#Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh

 BuildRequires: autoconf automake libtool
@ -20,7 +20,6 @@ BuildRequires: xorg-x11-proto-devel
 BuildRequires: pkgconfig(inputproto) >= 1.9.99.902
 BuildRequires: libX11-devel >= 1.2.99
 BuildRequires: libXext-devel
-BuildRequires: libXau-devel
 BuildRequires: xmlto asciidoc >= 8.4.5

 %description
@ -38,8 +37,8 @@ Requires: pkgconfig
 X.Org X11 libXi development package

 %prep
-#%setup -q
-%setup -q -n %{tarball}-%{gitdate}
+%setup -q
+#setup -q -n %{tarball}-%{gitdate}

 # Disable static library creation by default.
 %define with_static 0
@ -86,6 +85,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*

 %changelog
+* Tue Feb 02 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.3-2
+- Remove unnecessary libXau-devel BuildRequires.
+
+* Tue Oct 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.3-1
+- libXi 1.3
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.99-11.20090825
 - Update to today's git master, requires inputproto 1.9.99.902

--- a/2
+++ b/2
@ -1 +1 @@
-ffa25245465d6547b8d93870c201cb0a  libXi-20090825.tar.bz2
+8df4ece9bd1efb02c28acb2b6f485e09  libXi-1.3.tar.bz2
Author	SHA1	Message	Date
Fedora Release Engineering	ed7b01fd7f	dist-git conversion	2010-07-29 17:39:03 +00:00
Peter Hutterer	241199f75c	- Remove unnecessary libXau-devel BuildRequires.	2010-02-02 06:48:51 +00:00
Bill Nottingham	686587df4f	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:55:56 +00:00
Adam Jackson	add82132fe	- libXi 1.3	2009-10-06 17:28:49 +00:00
Jesse Keating	7681c156f1	Initialize branch F-12 for libXi	2009-09-29 05:17:24 +00:00
				`@ -1 +0,0 @@`
				`libXi-1_2_0-1_fc11:HEAD:libXi-1.2.0-1.fc11.src.rpm:1228320319`