rpms/xorg-x11-drv-savage/devel savage.xinf, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-savage.spec, 1.6, 1.7

Fri Feb 3 13:38:01 UTC 2006

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26637/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-savage.spec 
Added Files:
	savage.xinf 
Log Message:
auto-import xorg-x11-drv-savage-2.0.2.3-1 on branch devel from xorg-x11-drv-savage-2.0.2.3-1.src.rpm

--- NEW FILE savage.xinf ---
alias pcivideo:v00005333d00008A20sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A21sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A22sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A23sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A25sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A26sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C10sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C11sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C12sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C13sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C22sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C24sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C26sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Asv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Bsv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Csv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Dsv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Esv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Fsv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D01sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D02sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D03sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D04sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00009102sv*sd*bc*sc*i* savage


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:46:38 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:37:58 -0000	1.6
@@ -1 +1 @@
-xf86-video-savage-2.0.2.2.tar.bz2
+xf86-video-savage-2.0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:46:38 -0000	1.5
+++ sources	3 Feb 2006 13:37:58 -0000	1.6
@@ -1 +1 @@
-417de585f4e84f70414436054b580a3f  xf86-video-savage-2.0.2.2.tar.bz2
+28ec4e07bda55ab8b35b4735405ac5a3  xf86-video-savage-2.0.2.3.tar.bz2


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/xorg-x11-drv-savage.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-savage.spec	24 Dec 2005 03:46:38 -0000	1.6
+++ xorg-x11-drv-savage.spec	3 Feb 2006 13:37:58 -0000	1.7
@@ -1,9 +1,5 @@
 %define tarball xf86-video-savage
-# All packages should own all dirs they lead up to, for saner
-# rpm packaging, in particular if the leading dirs are not owned by
-# the "filesystem" package.
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
-# define driverdir to the appropriate type for this driver class
 %define driverdir	%{moduledir}/drivers
 
 %define cvsdate xxxxxxx
@@ -16,13 +12,11 @@
 
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
-Version: 2.0.2.2
-Release: 1
+Version:   2.0.2.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source1:   savage.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +30,7 @@
 %endif
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 savage video driver.
 
@@ -48,11 +43,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install 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 --
@@ -65,14 +61,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/savage_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/savage.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/savage.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.0.2.3-1
+- Updated xorg-x11-drv-savage to version 2.0.2.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 2.0.2.2-1
 - Updated xorg-x11-drv-savage to version 2.0.2.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.


