rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.24,1.25

Adam Jackson (ajax) fedora-extras-commits at redhat.com
Thu Sep 6 21:07:53 UTC 2007


Author: ajax

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

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.2.2-4
- Explain why there's no ldconfig for the xvmc drivers. (#226633)



Index: xorg-x11-drv-via.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-via/devel/xorg-x11-drv-via.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xorg-x11-drv-via.spec	24 Aug 2007 12:06:50 -0000	1.24
+++ xorg-x11-drv-via.spec	6 Sep 2007 21:07:20 -0000	1.25
@@ -4,16 +4,10 @@
 
 %define with_xvmc 1
 
-%ifarch %{ix86} x86_64
-%define with_dri 1
-%else
-%define with_dri 0
-%endif
-
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.2.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -28,9 +22,7 @@
 %if %{with_xvmc}
 BuildRequires: libXvMC-devel
 %endif
-%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.0-1
-%endif
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
 
@@ -51,12 +43,7 @@
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static \
-%if %{with_dri}
-           --enable-dri
-%else
-           --disable-dri
-%endif
+%configure --disable-static --enable-dri
 
 make
 
@@ -68,13 +55,15 @@
 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 --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# There's no %post ldconfig for these, because even though they're DSOs,
+# they're not meant to ever be linked against.  They're dlopen'd by
+# libXvMC.so itself.
+
 %files
 %defattr(-,root,root,-)
 %{driverdir}/via_drv.so
@@ -95,6 +84,9 @@
 %endif
 
 %changelog
+* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 0.2.2-4
+- Explain why there's no ldconfig for the xvmc drivers. (#226633)
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> - 0.2.2-3
 - Rebuild for build ID
 




More information about the scm-commits mailing list