|
@@ -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.9.4
|
|
|
|
|
|
+Version: 1.10.0
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
URL: http://www.x.org
|
|
URL: http://www.x.org
|
|
License: MIT/X11
|
|
License: MIT/X11
|
|
@@ -25,9 +25,6 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
|
|
|
|
|
|
Patch5: xserver-1.8.1-pic-libxf86config.patch
|
|
Patch5: xserver-1.8.1-pic-libxf86config.patch
|
|
|
|
|
|
-# OpenGL compositing manager feature/optimization patches.
|
|
|
|
-Patch103: xserver-1.5.0-bg-none-root.patch
|
|
|
|
-
|
|
|
|
Patch2014: xserver-1.5.0-projector-fb-size.patch
|
|
Patch2014: xserver-1.5.0-projector-fb-size.patch
|
|
|
|
|
|
# Trivial things to never merge upstream ever:
|
|
# Trivial things to never merge upstream ever:
|
|
@@ -41,12 +38,13 @@ Patch6002: xserver-1.5.1-mode-debug.patch
|
|
Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
|
|
Patch6011: xserver-1.6.0-less-acpi-brokenness.patch
|
|
|
|
|
|
# needs to upstream this
|
|
# needs to upstream this
|
|
-Patch6027: xserver-1.9.2-displayfd.patch
|
|
|
|
|
|
+Patch6027: xserver-1.10.0-displayfd.patch
|
|
Patch6028: xserver-1.6.99-randr-error-debugging.patch
|
|
Patch6028: xserver-1.6.99-randr-error-debugging.patch
|
|
-Patch6030: xserver-1.9.2-right-of.patch
|
|
|
|
|
|
+Patch6030: xserver-1.10.0-right-of.patch
|
|
Patch6033: xserver-1.6.99-default-modes.patch
|
|
Patch6033: xserver-1.6.99-default-modes.patch
|
|
|
|
|
|
-Patch6049: xserver-1.7.1-multilib.patch
|
|
|
|
|
|
+# misc
|
|
|
|
+Patch7005: xserver-1.9.0-qxl-fallback.patch
|
|
|
|
|
|
## Vine Patch
|
|
## Vine Patch
|
|
# autodetect nvidia driver
|
|
# autodetect nvidia driver
|
|
@@ -59,7 +57,7 @@ Patch10030: xorg-x11-server-1.9.2-qemu.patch
|
|
Patch10040: xorg-x11-server-1.9.2-vesa-fallback.patch
|
|
Patch10040: xorg-x11-server-1.9.2-vesa-fallback.patch
|
|
|
|
|
|
# do not disable kbd driver even if AllowEmptyInput option is on.
|
|
# do not disable kbd driver even if AllowEmptyInput option is on.
|
|
-Patch20000: xorg-x11-server-1.6.0-dont-dsiable-kbd-if-AEI-on.patch
|
|
|
|
|
|
+Patch20000: xorg-x11-server-1.10.0-dont-dsiable-kbd-if-AEI-on.patch
|
|
|
|
|
|
%define moduledir %{_libdir}/xorg/modules
|
|
%define moduledir %{_libdir}/xorg/modules
|
|
%define drimoduledir %{_libdir}/dri
|
|
%define drimoduledir %{_libdir}/dri
|
|
@@ -283,9 +281,6 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
|
|
|
|
%patch5 -p1 -b .pic-libxf86config
|
|
%patch5 -p1 -b .pic-libxf86config
|
|
|
|
|
|
-# OpenGL compositing manager feature/optimization patches.
|
|
|
|
-%patch103 -p1 -b .bg-none-root
|
|
|
|
-
|
|
|
|
%patch2014 -p1 -b .projector-fb-size
|
|
%patch2014 -p1 -b .projector-fb-size
|
|
|
|
|
|
%patch5002 -p1 -b .ssh-isnt-local
|
|
%patch5002 -p1 -b .ssh-isnt-local
|
|
@@ -300,7 +295,7 @@ Xserver source code needed to build VNC server (Xvnc)
|
|
%patch6028 -p1 -b .randr-error-debugging
|
|
%patch6028 -p1 -b .randr-error-debugging
|
|
%patch6030 -p1 -b .right-of
|
|
%patch6030 -p1 -b .right-of
|
|
|
|
|
|
-%patch6049 -p1 -b .multilib.patch
|
|
|
|
|
|
+%patch7005 -p1 -b .qxl
|
|
|
|
|
|
# Vine patch
|
|
# Vine patch
|
|
%patch10010 -p1 -b .nvidia
|
|
%patch10010 -p1 -b .nvidia
|
|
@@ -331,7 +326,7 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
|
|
--with-int10=x86emu \
|
|
--with-int10=x86emu \
|
|
--with-default-font-path=%{default_font_path} \
|
|
--with-default-font-path=%{default_font_path} \
|
|
--with-module-dir=%{moduledir} \
|
|
--with-module-dir=%{moduledir} \
|
|
- --with-os-name="Vine Linux 5" \
|
|
|
|
|
|
+ --with-os-name="Vine Linux 6" \
|
|
--with-vendor-web="http://vinelinux.org/" \
|
|
--with-vendor-web="http://vinelinux.org/" \
|
|
--with-vendor-name="Project Vine" \
|
|
--with-vendor-name="Project Vine" \
|
|
--with-builderstring="Build ID: %{name} %{version}-%{release}" \
|
|
--with-builderstring="Build ID: %{name} %{version}-%{release}" \
|
|
@@ -369,8 +364,13 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
|
|
# Make the source package
|
|
# Make the source package
|
|
%define xserver_source_dir %{_datadir}/xorg-x11-server-source
|
|
%define xserver_source_dir %{_datadir}/xorg-x11-server-source
|
|
%define inst_srcdir %{buildroot}/%{xserver_source_dir}
|
|
%define inst_srcdir %{buildroot}/%{xserver_source_dir}
|
|
-mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
|
|
|
|
-cp cpprules.in %{inst_srcdir}
|
|
|
|
|
|
+mkdir -p %{inst_srcdir}/{doc/xml{,/dtrace},Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
|
|
|
|
+cp {,%{inst_srcdir}/}doc/xml/xmlrules.in
|
|
|
|
+cp {,%{inst_srcdir}/}doc/xml/xmlrules-noinst.in
|
|
|
|
+cp {,%{inst_srcdir}/}doc/xml/xmlrules-inst.in
|
|
|
|
+cp {,%{inst_srcdir}/}doc/xml/xserver.ent.in
|
|
|
|
+cp {,%{inst_srcdir}/}doc/xml/Xserver-spec.xml
|
|
|
|
+cp {,%{inst_srcdir}/}doc/xml/dtrace/Xserver-DTrace.xml
|
|
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
|
|
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
|
|
cp xkb/README.compiled %{inst_srcdir}/xkb
|
|
cp xkb/README.compiled %{inst_srcdir}/xkb
|
|
cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
|
|
cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
|
|
@@ -486,6 +486,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_mandir}/man4/fbdevhw.4*
|
|
%{_mandir}/man4/fbdevhw.4*
|
|
%{_mandir}/man4/exa.4*
|
|
%{_mandir}/man4/exa.4*
|
|
%{_mandir}/man5/xorg.conf.5*
|
|
%{_mandir}/man5/xorg.conf.5*
|
|
|
|
+%{_mandir}/man5/xorg.conf.d.5*
|
|
%dir %{_sysconfdir}/X11/xorg.conf.d
|
|
%dir %{_sysconfdir}/X11/xorg.conf.d
|
|
%dir %{_datadir}/X11/xorg.conf.d
|
|
%dir %{_datadir}/X11/xorg.conf.d
|
|
%{_datadir}/X11/xorg.conf.d/*.conf
|
|
%{_datadir}/X11/xorg.conf.d/*.conf
|
|
@@ -547,6 +548,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Feb 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- fix %%install to add xmlrules.in
|
|
|
|
+- drop Patch103,6049
|
|
|
|
+- update Patch6027,6030,20000
|
|
|
|
+- add Patch7005 (xserver-1.9.0-qxl-fallback.patch)
|
|
|
|
+
|
|
* Sat Feb 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9.4-1
|
|
* Sat Feb 05 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9.4-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|