rpms/xorg-x11-server/devel .cvsignore, 1.66, 1.67 commitid, 1.29, 1.30 sources, 1.61, 1.62 xorg-x11-server.spec, 1.463, 1.464

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv416

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Log Message:
* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-29.20090807
- rebase upstream
- libxf86config.a revenge, brought back .a upstream, doesn't work as .so



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	4 Aug 2009 06:10:29 -0000	1.66
+++ .cvsignore	7 Aug 2009 05:48:12 -0000	1.67
@@ -1 +1 @@
-xorg-server-20090804.tar.bz2
+xorg-server-20090807.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- commitid	4 Aug 2009 06:10:29 -0000	1.29
+++ commitid	7 Aug 2009 05:48:12 -0000	1.30
@@ -1 +1 @@
-736f2d64725c6df8413e627bd40ce7ecb011acc7
+e94c7c42ce9d6a194b76ba7e8b3904b180f93a1b


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	4 Aug 2009 06:10:29 -0000	1.61
+++ sources	7 Aug 2009 05:48:12 -0000	1.62
@@ -1 +1 @@
-7588aa54124e59be6989a9f70d935d0a  xorg-server-20090804.tar.bz2
+13b6f940d5b27fe39fbd6bfbd5801983  xorg-server-20090807.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -p -r1.463 -r1.464
--- xorg-x11-server.spec	6 Aug 2009 18:05:30 -0000	1.463
+++ xorg-x11-server.spec	7 Aug 2009 05:48:12 -0000	1.464
@@ -1,4 +1,4 @@
-# This package is an experiment in active integration of upstream SCM with
+9 This package is an experiment in active integration of upstream SCM with
 # Fedora packaging.  It works something like this:
 #
 # The "pristine" source is actually a git repo (with no working checkout).
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090804
+%define gitdate 20090807
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   28.%{gitdate}%{?dist}
+Release:   29.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -267,7 +267,6 @@ Obsoletes: xorg-x11-sdk xorg-x11-server-
 Requires: xorg-x11-util-macros
 Requires: xorg-x11-proto-devel
 Requires: pkgconfig pixman-devel libpciaccess-devel
-Provides: libxf86config-devel = %{version}-%{release}
 # Virtual provide for transition.  Delete me someday.
 Provides: xorg-x11-server-sdk = %{version}-%{release}
 
@@ -286,17 +285,9 @@ BuildArch: noarch
 %description source
 Xserver source code needed to build VNC server (Xvnc)
 
-%package -n libxf86config
-Summary: Xorg configuration parser library
-Group: System Environment/Libraries
-
-%description -n libxf86config
-Xorg configuration parser library
-
 %package -n libxf86config-devel
 Summary: Xorg configuration parser library development files
 Group: Development/Libraries
-Requires: libxf86config = %{version}-%{release}
 Requires: xorg-x11-server-devel = %{version}-%{release}
 
 %description -n libxf86config-devel
@@ -516,18 +507,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{xserver_source_dir}
 
-
-%files -n libxf86config
-%defattr(-, root, root, -)
-%{_libdir}/libxf86config.so.0*
-
-
 %files -n libxf86config-devel
 %defattr(-, root, root, -)
-%{_libdir}/libxf86config.so
+%{_libdir}/libxf86config.a
 
 
 %changelog
+* Fri Aug 07 2009 Dave Airlie <airlied at redhat.com> 1.6.99-29.20090807
+- rebase upstream
+- libxf86config.a revenge, brought back .a upstream, doesn't work as .so
+
 * Thu Aug 06 2009 Adam Jackson <ajax at redhat.com> 1.6.99-28.20090804
 - xserver-1.6.99-dri2-crash-fixes.patch: don't cough and die just because
   the driver had the gall not to register a SwapBuffers handler.