From 7681c156f100121e03d3d174aa3efcd1ba358aa5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:17:24 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for libXi --- 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 add82132fec80fd145a6737f37e878b5ea051168 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Oct 2009 17:28:49 +0000 Subject: [PATCH 2/5] - libXi 1.3 --- libXi.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libXi.spec b/libXi.spec index b45133e..a73af87 100644 --- 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: 1%{?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 @@ -38,8 +38,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 +86,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Oct 06 2009 Peter Hutterer 1.3-1 +- libXi 1.3 + * Tue Aug 25 2009 Peter Hutterer 1.2.99-11.20090825 - Update to today's git master, requires inputproto 1.9.99.902 diff --git a/sources b/sources index e05ebe7..ff5849f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffa25245465d6547b8d93870c201cb0a libXi-20090825.tar.bz2 +8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 From 686587df4f9d2678b6da344740497c3ce836e646 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:56 +0000 Subject: [PATCH 3/5] 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 f4893f7..49ff749 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXi -# $Id: Makefile,v 1.1 2005/08/26 21:27:45 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:21 notting 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 +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 241199f75c43be27b439a989688d675ac3ce4005 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 2 Feb 2010 06:48:51 +0000 Subject: [PATCH 4/5] - Remove unnecessary libXau-devel BuildRequires. --- libXi.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libXi.spec b/libXi.spec index a73af87..4577b5f 100644 --- a/libXi.spec +++ b/libXi.spec @@ -4,7 +4,7 @@ Summary: X.Org X11 libXi runtime library Name: libXi Version: 1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -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 @@ -86,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Feb 02 2010 Peter Hutterer 1.3-2 +- Remove unnecessary libXau-devel BuildRequires. + * Tue Oct 06 2009 Peter Hutterer 1.3-1 - libXi 1.3 From ed7b01fd7f74f56f4ddeb3704d75415a6d849abe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:39:03 +0000 Subject: [PATCH 5/5] 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 49ff749..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXi -# $Id: Makefile,v 1.2 2007/10/15 18:58:21 notting 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 $$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),) -# 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) 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 8d3276e..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libXi-1_2_0-1_fc11:HEAD:libXi-1.2.0-1.fc11.src.rpm:1228320319