rpms/libX11/devel commitid, NONE, 1.1 make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.15, 1.16 libX11.spec, 1.61, 1.62 sources, 1.14, 1.15 libX11-1.2.1-indic.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4038

Modified Files:
	.cvsignore libX11.spec sources 
Added Files:
	commitid make-git-snapshot.sh 
Removed Files:
	libX11-1.2.1-indic.patch 
Log Message:
* Sun Jul 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-1.20090712
- Today's git snapshot
- libX11-1.2.1-indic.patch: Drop.



--- NEW FILE commitid ---
554f755e5545f63d3c8f299297927238da155773


--- NEW FILE make-git-snapshot.sh ---
#!/bin/sh

DIRNAME=libX11-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/xorg/lib/libX11 $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
git log | head -1 | awk '{ print $2 }' > ../commitid
git repack -a -d
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	6 Jul 2009 21:13:40 -0000	1.15
+++ .cvsignore	12 Jul 2009 07:11:34 -0000	1.16
@@ -1 +1 @@
-libX11-1.2.1.tar.bz2
+libX11-20090712.tar.bz2


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- libX11.spec	6 Jul 2009 21:49:59 -0000	1.61
+++ libX11.spec	12 Jul 2009 07:11:35 -0000	1.62
@@ -1,18 +1,21 @@
+%define tarball libX11
+%define gitdate 20090712
+
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.2.1
-Release: 3%{?dist}
+Version: 1.2.99
+Release: 1.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 #Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2 
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
 
 Patch2: dont-forward-keycode-0.patch
-# #497971, patch from upstream, drop with 1.2.2
-Patch3: libX11-1.2.1-indic.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 # xproto >= 7.0.6 required
@@ -51,9 +54,9 @@ Requires: pkgconfig
 X.Org X11 libX11 development package
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{tarball}-%{gitdate}
 %patch2 -p1 -b .dont-forward-keycode-0
-%patch3 -p1 -b .indic
 
 %build
 # sodding libtool
@@ -118,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Sun Jul 12 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-1.20090712
+- Today's git snapshot
+- libX11-1.2.1-indic.patch: Drop.
+
 * Mon Jul 06 2009 Adam Jackson <ajax at redhat.com> 1.2.1-3
 - -common subpackage
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	6 Jul 2009 21:13:40 -0000	1.14
+++ sources	12 Jul 2009 07:11:35 -0000	1.15
@@ -1 +1 @@
-2f2beb98e71f397e1209beaca4e97cb1  libX11-1.2.1.tar.bz2
+59e23f040427385c116f03ece2bdf880  libX11-20090712.tar.bz2


--- libX11-1.2.1-indic.patch DELETED ---