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

Fri Feb 3 13:35:03 UTC 2006

Author: mharris

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

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

--- NEW FILE mga.xinf ---
alias pcivideo:v0000102Bd00000010sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000518sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000519sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Asv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Bsv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Esv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Fsv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000520sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000521sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000541bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000542bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000641bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000642bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd000007C0bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd000007C1bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000D41bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000D42bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E00bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E01bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E02bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E03bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F80bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F81bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F82bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F83bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv00001705sd00000001bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00001000sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00001001sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00002007sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00002527sv*sd*bc*sc*i* mga


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:43:49 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:35:00 -0000	1.6
@@ -1 +1 @@
-xf86-video-mga-1.2.1.2.tar.bz2
+xf86-video-mga-1.2.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:43:49 -0000	1.5
+++ sources	3 Feb 2006 13:35:00 -0000	1.6
@@ -1 +1 @@
-9581f3bcf814bcf27378225833c7ff82  xf86-video-mga-1.2.1.2.tar.bz2
+9895de01c57354c7aa80907dc05b7e66  xf86-video-mga-1.2.1.3.tar.bz2


Index: xorg-x11-drv-mga.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/xorg-x11-drv-mga.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-mga.spec	24 Dec 2005 03:43:49 -0000	1.5
+++ xorg-x11-drv-mga.spec	3 Feb 2006 13:35:00 -0000	1.6
@@ -1,32 +1,27 @@
 %define tarball xf86-video-mga
-# 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 mga video driver
 Name:      xorg-x11-drv-mga
-Version: 1.2.1.2
-Release: 1
+Version:   1.2.1.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:   mga.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 mga video driver.
 
@@ -39,14 +34,15 @@
 
 %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 --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 # NOTE: Intentionally remove hardware specific utilities, we generally do not
 # supply these in the core OS.
@@ -60,14 +56,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/mga_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/mga.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/mga.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.2.1.3-1
+- Updated xorg-x11-drv-mga to version 1.2.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.2.1.2-1
 - Updated xorg-x11-drv-mga to version 1.2.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.


