rpms/xorg-x11-server/devel xorg-x11-server.spec,1.425,1.426
Adam Jackson
ajax at fedoraproject.org
Wed Mar 18 13:36:53 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26630
Modified Files:
xorg-x11-server.spec
Log Message:
* Wed Mar 18 2009 Adam Jackson <ajax at redhat.com> 1.6.0-14
- s390 fixes (Karsten Hopp)
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- xorg-x11-server.spec 12 Mar 2009 17:34:00 -0000 1.425
+++ xorg-x11-server.spec 18 Mar 2009 13:36:23 -0000 1.426
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.0
-Release: 13%{?dist}
+Release: 14%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -315,6 +315,12 @@
%define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
+%if %{with_hw_servers}
+%define dri_flags --with-dri-driver-path=%{drimoduledir}
+%else
+%define dri_flags --disable-dri
+%endif
+
# --with-rgb-path should be superfluous now ?
# --with-pie ?
autoreconf -v --install || exit 1
@@ -329,7 +335,7 @@
--with-xkb-output=%{_localstatedir}/lib/xkb \
--enable-install-libxf86config \
--enable-xselinux --enable-record \
- --with-dri-driver-path=%{drimoduledir} \
+ %{dri_flags} \
${CONFIGURE}
make %{?_smp_mflags}
@@ -372,6 +378,10 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+%if !%{with_hw_servers}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc
+ rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4
+%endif
}
%clean
@@ -511,6 +521,9 @@
%changelog
+* Wed Mar 18 2009 Adam Jackson <ajax at redhat.com> 1.6.0-14
+- s390 fixes (Karsten Hopp)
+
* Thu Mar 12 2009 Adam Jackson <ajax at redhat.com> 1.6.0-13
- xselinux-1.6.0-selinux-nlfd.patch: Acquire the netlink socket from selinux,
check it ourselves rather than having libselinux bang on it all the time.
More information about the fedora-extras-commits
mailing list