|
@@ -5,7 +5,7 @@
|
|
Summary: X.Org X11 X server
|
|
Summary: X.Org X11 X server
|
|
Summary(ja): X.Org X11 X サーバ
|
|
Summary(ja): X.Org X11 X サーバ
|
|
Name: xorg-x11-server
|
|
Name: xorg-x11-server
|
|
-Version: 1.12.4
|
|
+Version: 1.14.1
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
URL: http://www.x.org
|
|
URL: http://www.x.org
|
|
License: MIT/X11
|
|
License: MIT/X11
|
|
@@ -38,7 +38,6 @@ Patch6002: xserver-1.12.1-mode-debug.patch
|
|
Patch6011: xserver-1.12.0-less-acpi-brokenness.patch
|
|
Patch6011: xserver-1.12.0-less-acpi-brokenness.patch
|
|
|
|
|
|
# needs to upstream this
|
|
# needs to upstream this
|
|
-Patch6027: xserver-1.12.1-displayfd.patch
|
|
|
|
Patch6028: xserver-1.12.1-randr-error-debugging.patch
|
|
Patch6028: xserver-1.12.1-randr-error-debugging.patch
|
|
Patch6030: xserver-1.12.4-right-of.patch
|
|
Patch6030: xserver-1.12.4-right-of.patch
|
|
Patch6033: xserver-1.6.99-default-modes.patch
|
|
Patch6033: xserver-1.6.99-default-modes.patch
|
|
@@ -72,7 +71,7 @@ Patch20000: xorg-server-1.12.1-dont-disable-kbd-if-AEI-on.patch
|
|
%define enable_xorg --disable-xorg
|
|
%define enable_xorg --disable-xorg
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
|
|
+%define kdrive --enable-kdrive --enable-xephyr --disable-xfake --disable-xfbdev
|
|
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
|
|
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
@@ -292,7 +291,6 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
%patch6011 -p1 -b .less-acpi-brokenness
|
|
%patch6011 -p1 -b .less-acpi-brokenness
|
|
|
|
|
|
# needs to upstream this
|
|
# needs to upstream this
|
|
-%patch6027 -p1 -b .displayfd
|
|
|
|
%patch6028 -p1 -b .randr-error-debugging
|
|
%patch6028 -p1 -b .randr-error-debugging
|
|
%patch6030 -p1 -b .right-of
|
|
%patch6030 -p1 -b .right-of
|
|
|
|
|
|
@@ -330,7 +328,6 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
|
|
--with-vendor-name="Project Vine" \
|
|
--with-vendor-name="Project Vine" \
|
|
--with-builderstring="Build ID: %{name} %{version}-%{release}" \
|
|
--with-builderstring="Build ID: %{name} %{version}-%{release}" \
|
|
--with-xkb-output=%{_localstatedir}/lib/xkb \
|
|
--with-xkb-output=%{_localstatedir}/lib/xkb \
|
|
- --with-rgb-path=%{_datadir}/X11/rgb \
|
|
|
|
--enable-install-libxf86config \
|
|
--enable-install-libxf86config \
|
|
--disable-xselinux --enable-record \
|
|
--disable-xselinux --enable-record \
|
|
--enable-config-udev \
|
|
--enable-config-udev \
|
|
@@ -451,11 +448,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
%dir %{_libdir}/xorg/modules/drivers
|
|
%dir %{_libdir}/xorg/modules/drivers
|
|
%dir %{_libdir}/xorg/modules/extensions
|
|
%dir %{_libdir}/xorg/modules/extensions
|
|
%{_libdir}/xorg/modules/extensions/libglx.so
|
|
%{_libdir}/xorg/modules/extensions/libglx.so
|
|
-%{_libdir}/xorg/modules/extensions/libdri.so
|
|
|
|
-%{_libdir}/xorg/modules/extensions/libdri2.so
|
|
|
|
-%{_libdir}/xorg/modules/extensions/libdbe.so
|
|
|
|
-%{_libdir}/xorg/modules/extensions/libextmod.so
|
|
|
|
-%{_libdir}/xorg/modules/extensions/librecord.so
|
|
|
|
%dir %{_libdir}/xorg/modules/input
|
|
%dir %{_libdir}/xorg/modules/input
|
|
%dir %{_libdir}/xorg/modules/multimedia
|
|
%dir %{_libdir}/xorg/modules/multimedia
|
|
%{_libdir}/xorg/modules/multimedia/bt829_drv.so
|
|
%{_libdir}/xorg/modules/multimedia/bt829_drv.so
|
|
@@ -474,7 +466,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_libdir}/xorg/modules/libvbe.so
|
|
%{_libdir}/xorg/modules/libvbe.so
|
|
%{_libdir}/xorg/modules/libvgahw.so
|
|
%{_libdir}/xorg/modules/libvgahw.so
|
|
%{_libdir}/xorg/modules/libwfb.so
|
|
%{_libdir}/xorg/modules/libwfb.so
|
|
-%{_libdir}/xorg/modules/libxaa.so
|
|
|
|
%{_mandir}/man1/gtf.1*
|
|
%{_mandir}/man1/gtf.1*
|
|
%{_mandir}/man1/Xorg.1*
|
|
%{_mandir}/man1/Xorg.1*
|
|
%{_mandir}/man1/cvt.1*
|
|
%{_mandir}/man1/cvt.1*
|
|
@@ -543,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.14.1-1
|
|
|
|
+- new upstream release
|
|
|
|
+- remove Patch6027 (xserver-1.12.1-displayfd.patch)
|
|
|
|
+
|
|
* Mon Aug 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.4-1
|
|
* Mon Aug 27 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.12.4-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- update Patch6030 (xserver-1.12.4-right-of.patch)
|
|
- update Patch6030 (xserver-1.12.4-right-of.patch)
|