rpms/libdrm/F-11 .cvsignore, 1.20, 1.21 libdrm.spec, 1.77, 1.78 make-git-snapshot.sh, 1.3, 1.4 sources, 1.20, 1.21

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libdrm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25447

Modified Files:
	.cvsignore libdrm.spec make-git-snapshot.sh sources 
Log Message:
* Fri Jun 26 2009 Adam Jackson <ajax at redhat.com> 2.4.11-1
- Today's git snapshot, merges a bunch of stuff.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	6 Apr 2009 21:50:36 -0000	1.20
+++ .cvsignore	26 Jun 2009 18:34:23 -0000	1.21
@@ -1 +1,2 @@
 libdrm-2.4.6.tar.bz2
+libdrm-20090626.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/libdrm.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- libdrm.spec	20 May 2009 21:36:51 -0000	1.77
+++ libdrm.spec	26 Jun 2009 18:34:23 -0000	1.78
@@ -1,14 +1,14 @@
-%define gitdate 20080930
+%define gitdate 20090626
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.6
-Release: 7%{?dist}
+Version: 2.4.11
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-#Source0: %{name}-%{gitdate}.tar.bz2
+#Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
 Source1: make-git-snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,18 +22,10 @@ BuildRequires: libudev-devel
 
 Source2: 91-drm-modeset.rules
 
-# totally busted connector code
-Patch0: libdrm-2.4.7-revert-bong.patch
 # hardcode the 666 instead of 660 for device nodes
 Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
 Patch4: libdrm-2.4.0-no-bc.patch
-# radeon libdrm patches from modesetting-gem branch of upstream
-Patch8: libdrm-radeon.patch
-# nouveau fixes from drm.git
-Patch9: nouveau-updates.patch
-
-Patch10: libdrm-intel-limit-cachable-size.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -49,17 +41,13 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .bong
+%setup -q -n %{name}-%{gitdate}
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
-%patch8 -p1 -b .radeon
-%patch9 -p1 -b .nouveau
-%patch10 -p1 -b .limit-cachable
 
 %build
 autoreconf -v --install || exit 1
-%configure --enable-udev --enable-nouveau-experimental-api
+%configure --enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api
 make %{?_smp_mflags}
 
 %install
@@ -115,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Jun 26 2009 Adam Jackson <ajax at redhat.com> 2.4.11-1
+- Today's git snapshot, merges a bunch of stuff.
+
 * Tue May 19 2009 Kristian Høgsberg <krh at redhat.com> - 2.4.6-7
 - Add patch to limit cachable object size (#498131).
 


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/make-git-snapshot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- make-git-snapshot.sh	14 Aug 2008 05:51:06 -0000	1.3
+++ make-git-snapshot.sh	26 Jun 2009 18:34:23 -0000	1.4
@@ -16,10 +16,6 @@ rm -rf $DIRNAME
 git clone ${REF:+--reference $REF} \
 	git://git.freedesktop.org/git/mesa/drm $DIRNAME
 
-cd $DIRNAME
-git checkout -f origin/modesetting-gem
-cd -
-
 GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
 	| bzip2 > $DIRNAME.tar.bz2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-11/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	6 Apr 2009 21:50:36 -0000	1.20
+++ sources	26 Jun 2009 18:34:23 -0000	1.21
@@ -1 +1 @@
-77fb9621fbcc7a75599b656065c232a6  libdrm-2.4.6.tar.bz2
+ad683d96c96e3efb2918d918058a029e  libdrm-20090626.tar.bz2