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

Fri Feb 3 13:37:23 UTC 2006

Author: mharris

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

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

--- NEW FILE s3.xinf ---
alias pcivideo:v00001092d00008811sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008801sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008810sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008811sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008812sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008813sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008814sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008815sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D0sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D1sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D2sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D3sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F0sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F1sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F2sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F3sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008905sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008906sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008907sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008908sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008909sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Asv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Bsv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Csv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Dsv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Esv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Fsv*sd*bc*sc*i* s3


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


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:46:06 -0000	1.5
+++ sources	3 Feb 2006 13:37:20 -0000	1.6
@@ -1 +1 @@
-ebc8bd3f52666e0e9c9d52e01ed88ec1  xf86-video-s3-0.3.5.4.tar.bz2
+fa2c90793e895c0b144445e998661aa4  xf86-video-s3-0.3.5.5.tar.bz2


Index: xorg-x11-drv-s3.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/xorg-x11-drv-s3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-s3.spec	24 Dec 2005 03:46:06 -0000	1.6
+++ xorg-x11-drv-s3.spec	3 Feb 2006 13:37:20 -0000	1.7
@@ -1,22 +1,16 @@
 %define tarball xf86-video-s3
-# 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
 
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
-Version: 0.3.5.4
-Release: 1
+Version:   0.3.5.5
+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:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source1:   s3.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 s3 video driver.
 
@@ -39,14 +34,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
 
 # 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 --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,15 +49,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/s3_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/s3.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-1
+- Updated xorg-x11-drv-s3 to version 0.3.5.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.4-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -75,6 +66,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.1-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 0.3.5-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.


