rpms/libdrm/devel .cvsignore, 1.26, 1.27 libdrm.spec, 1.86, 1.87 sources, 1.26, 1.27 intel-busy.patch, 1.1, NONE radeon-busy.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

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

Modified Files:
	.cvsignore libdrm.spec sources 
Removed Files:
	intel-busy.patch radeon-busy.patch 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.4.14-1
- rebase to latest upstream release - drop carried patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	20 Aug 2009 06:23:05 -0000	1.26
+++ .cvsignore	25 Sep 2009 01:58:04 -0000	1.27
@@ -1 +1 @@
-libdrm-20090820.tar.bz2
+libdrm-2.4.14.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- libdrm.spec	10 Sep 2009 18:02:20 -0000	1.86
+++ libdrm.spec	25 Sep 2009 01:58:04 -0000	1.87
@@ -2,13 +2,13 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.12
-Release: 0.10%{?dist}
+Version: 2.4.14
+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)
 
@@ -46,12 +46,11 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-%setup -q -n %{name}-%{gitdate}
-%patch2 -p1 -b .radeon-busy
+#%setup -q -n %{name}-%{gitdate}
+%setup -q 
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .page-flip
-%patch6 -p1 -b .intel-busy
 
 %build
 autoreconf -v --install || exit 1
@@ -111,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 2.4.14-1
+- rebase to latest upstream release - drop carried patches
+
 * Thu Sep 10 2009 Kristian Høgsberg <krh at redhat.com> - 2.4.12-0.10
 - Pull in intel bo busy.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	20 Aug 2009 06:23:05 -0000	1.26
+++ sources	25 Sep 2009 01:58:05 -0000	1.27
@@ -1 +1 @@
-5809b178402f94c8ae1eadb9c3afdecb  libdrm-20090820.tar.bz2
+e785b6a6ebd6b8a49dd8210cd8742842  libdrm-2.4.14.tar.bz2


--- intel-busy.patch DELETED ---


--- radeon-busy.patch DELETED ---