rpms/xorg-x11-drv-amd/devel .cvsignore, 1.8, 1.9 sources, 1.10, 1.11 xorg-x11-drv-amd.spec, 1.19, 1.20 amd-pciaccess-fix.patch, 1.1, NONE lx-disable-compression.patch, 1.1, NONE

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/xorg-x11-drv-amd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1047

Modified Files:
	.cvsignore sources xorg-x11-drv-amd.spec 
Removed Files:
	amd-pciaccess-fix.patch lx-disable-compression.patch 
Log Message:
2.7.7.7 with geode name compat, next release will rename entirely



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Mar 2008 06:40:49 -0000	1.8
+++ .cvsignore	14 Mar 2008 21:06:13 -0000	1.9
@@ -1 +1 @@
-xf86-video-amd-0.0-git20080310.tar.bz2
+xf86-video-amd-2.7.7.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Mar 2008 06:40:49 -0000	1.10
+++ sources	14 Mar 2008 21:06:13 -0000	1.11
@@ -1 +1 @@
-0965e0e8b02811ed42bb00540878f14c  xf86-video-amd-0.0-git20080310.tar.bz2
+2f3e8c3019afda926e7ab95b074c35e1  xf86-video-amd-2.7.7.7.tar.bz2


Index: xorg-x11-drv-amd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-amd/devel/xorg-x11-drv-amd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-amd.spec	10 Mar 2008 09:05:55 -0000	1.19
+++ xorg-x11-drv-amd.spec	14 Mar 2008 21:06:13 -0000	1.20
@@ -2,18 +2,16 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define gitdate 20080310
-
 Summary:   Xorg X11 AMD Geode video driver
 Name:      xorg-x11-drv-amd
-Version:   0.0
-Release:   26.%{gitdate}%{?dist}
-URL:       http://git.infradead.org/?p=users/jcrouse/xf86-video-amd.git
-Source0:    xf86-video-amd-0.0-git%{gitdate}.tar.bz2
-#Source1:   amd.xinf
+Version:   2.7.7.7
+Release:   1%{?dist}
+URL:       http://www.x.org/wiki/AMDGeodeDriver
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-amd-2.7.7.7.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides:  xorg-x11-drv-geode-%{version}
 
 ExclusiveArch: %{ix86}
 
@@ -21,30 +19,16 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: gcc >= 3.4.0
-%if "%{dist}" == ".fc5"
 BuildRequires: xorg-x11-server-sdk
-%else
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
-%endif
 BuildRequires: xorg-x11-proto-devel
 
-%if "%{dist}" == "fc5"
-Requires:  xorg-x11-server-Xorg >= 1.1.0
-%else
 Requires:  xorg-x11-server-Xorg >= 1.1.0
-%endif
-
-Patch0: lx-disable-compression.patch
-Patch1: amd-pciaccess-fix.patch
 
 %description 
 X.Org X11 AMD Geode video driver.
 
 %prep
-%setup -q -n %{tarball}-2.7.7.6
-%patch0 -p1 -b .jx
-%patch1 -p1 -b .pciaccess
+%setup -q -n %{tarball}-%{version}
 
 # remind myself to do snapshots properly
 if [ -e %{tarball}/.git ] ; then
@@ -53,7 +37,6 @@
 fi
 
 %build
-autoreconf -v --install
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
 	     --enable-visibility
 make
@@ -63,22 +46,26 @@
 
 %makeinstall DESTDIR=$RPM_BUILD_ROOT
 
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-#install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
-
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+# Compat symlink for legacy driver name so existing xorg.conf's do not break
+ln -s amd_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/geode_drv.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %{driverdir}/amd_drv.so
+%{driverdir}/geode_drv.so
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Fri Mar 14 2008 Warren Togami <wtogami at redhat.com> 2.7.7.7-1
+- 2.7.7.7
+
 * Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 0.0-26.20080310
 - finally pciaccess build for AMD
 


--- amd-pciaccess-fix.patch DELETED ---


--- lx-disable-compression.patch DELETED ---