Summary: X.org server
Summary(pl): Serwer X.org
Name: xorg-xserver-server
-Version: 1.0.1
+Version: 1.1.99.901
Release: 0.1
License: MIT
Group: X11/Servers
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: aa0ccb851ec5f7f9b132581d9a5827e4
-Source1: http://dl.sourceforge.net/mesa3d/MesaLib-6.4.1.tar.bz2
-# Source1-md5: ea148c828ec6f645526451db1b8556f1
+Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
+# Source0-md5: 83f4fa9afa0826280fc37b3780e31d33
+%define mesa_version 6.5.1
+Source1: http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
+# Source1-md5: c46f2c6646a270911b791dd8e1c2d977
+Source2: xserver.pamd
Patch0: %{name}-ncurses.patch
Patch1: %{name}-symlinks.patch
+Patch2: %{name}-xwrapper.patch
+Patch3: %{name}-missing-files.patch
URL: http://xorg.freedesktop.org/
# for glx headers
-BuildRequires: Mesa-libGL-devel
+BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
BuildRequires: automake
BuildRequires: cpp
BuildRequires: libdrm-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
+BuildRequires: pam-devel
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: xorg-app-mkfontscale
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXau-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libfontenc-devel
BuildRequires: xorg-lib-liblbxutil-devel
BuildRequires: xorg-lib-libxkbfile-devel
-BuildRequires: xorg-lib-libxkbui-devel
+BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
BuildRequires: xorg-lib-xtrans-devel
BuildRequires: xorg-proto-bigreqsproto-devel
-BuildRequires: xorg-proto-compositeproto-devel
+BuildRequires: xorg-proto-compositeproto-devel >= 0.3
BuildRequires: xorg-proto-damageproto-devel
BuildRequires: xorg-proto-dmxproto-devel
BuildRequires: xorg-proto-evieext-devel
-BuildRequires: xorg-proto-fixesproto-devel
+BuildRequires: xorg-proto-fixesproto-devel >= 4.0
+BuildRequires: xorg-proto-fontcacheproto-devel
BuildRequires: xorg-proto-fontsproto-devel
-BuildRequires: xorg-proto-glproto-devel >= 1.4.1
+BuildRequires: xorg-proto-glproto-devel >= 1.4.7
+BuildRequires: xorg-proto-inputproto-devel
+BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
BuildRequires: xorg-proto-printproto-devel
BuildRequires: xorg-proto-randrproto-devel
BuildRequires: xorg-proto-recordproto-devel
BuildRequires: xorg-proto-renderproto-devel
BuildRequires: xorg-proto-resourceproto-devel
-BuildRequires: xorg-proto-scrnsaverproto-devel
+BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1.0
BuildRequires: xorg-proto-trapproto-devel
BuildRequires: xorg-proto-videoproto-devel
BuildRequires: xorg-proto-xcmiscproto-devel
BuildRequires: xorg-proto-xineramaproto-devel
BuildRequires: xorg-proto-xproto-devel
BuildRequires: xorg-util-util-macros >= 0.99.2
+# xcalibrateproto, tslib (for KDRIVE only)
+# glitz-devel >= 0.4.3 (for XGL and EGL only)
# for rgb.txt
Requires: xorg-app-rgb >= 0.99.3
Requires: xorg-app-xkbcomp
# just for %{_includedir}/bitmaps dir
Requires: xorg-data-xbitmaps
Requires: xorg-data-xkbdata
+# xserver requires default fixed and cursosr fonts.
+Requires: xorg-font-font-alias
+Requires: xorg-font-font-cursor-misc
+Requires: xorg-font-font-misc-misc-base >= 1.0.0-0.3
# for new app-defaults location
Requires: xorg-lib-libXt >= 1.0.0
Obsoletes: X11-Xserver
%description devel -l pl
Pliki nag³ówkowe dla serwera X.org.
+%package -n xorg-xserver-libglx
+Summary: GLX extension library fo X.org server
+Summary(pl): Biblioteka rozszerzenia GLX dla serwera X.org
+Group: X11/Servers
+Requires: xorg-xserver-server
+Provides: xorg-xserver-modules-libglx
+Obsoletes: xorg-driver-video-nvidia
+
+%description -n xorg-xserver-libglx
+GLX extension library fo X.org server.
+
+%description -n xorg-xserver-libglx -l pl
+Biblioteka rozszerzenia GLX dla serwera X.org.
+
%prep
%setup -q -a1 -n xorg-server-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p0
+%patch3 -p1
%build
%{__libtoolize}
%{__automake}
%configure \
--enable-dga \
+ --enable-builddocs \
--enable-lbx \
--enable-xevie \
+ --with-dri-driver-path=%{_libdir}/xorg/modules/dri \
--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
- --with-mesa-source="`pwd`/Mesa-6.4.1"
+ --with-mesa-source="`pwd`/Mesa-%{mesa_version}"
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install -d $RPM_BUILD_ROOT/etc/security/console.apps
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
+install hw/xfree86/parser/xf86Parser.h $RPM_BUILD_ROOT%{_includedir}/xorg/xf86Parser.h
+install hw/xfree86/parser/xf86Optrec.h $RPM_BUILD_ROOT%{_includedir}/xorg/xf86Optrec.h
+install hw/xfree86/parser/libxf86config.a $RPM_BUILD_ROOT%{_libdir}/libxf86config.a
+:> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
+:> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
+
rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
%clean
%files
%defattr(644,root,root,755)
-%doc COPYING ChangeLog
+%doc COPYING
%attr(755,root,root) %{_bindir}/X
%attr(755,root,root) %{_bindir}/Xorg
-%attr(755,root,root) %{_bindir}/getconfig
-%attr(755,root,root) %{_bindir}/getconfig.pl
+%attr(4755,root,root) %{_bindir}/Xwrapper
+%attr(755,root,root) %{_bindir}/cvt
%attr(755,root,root) %{_bindir}/gtf
%attr(755,root,root) %{_bindir}/in[bwl]
%attr(755,root,root) %{_bindir}/ioport
%{_includedir}/X11/pixmaps
%{_libdir}/X11/Cards
%{_libdir}/X11/Options
-%{_libdir}/X11/getconfig
%dir %{_libdir}/xorg
%dir %{_libdir}/xorg/modules
-%attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
+%dir %{_libdir}/xorg/modules/dri
+%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libGLcore.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libxtrap.so
%dir %{_libdir}/xorg/modules/fonts
%attr(755,root,root) %{_libdir}/xorg/modules/fonts/lib*.so
+%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/linux
%attr(755,root,root) %{_libdir}/xorg/modules/linux/libdrm.so
%attr(755,root,root) %{_libdir}/xorg/modules/linux/libfbdevhw.so
%dir %{_libdir}/xorg/modules/multimedia
%attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
+%attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
%dir %{_libdir}/xserver
%{_libdir}/xserver/SecurityPolicy
%{_datadir}/X11/app-defaults/XOrgCfg
%{_datadir}/X11/xkb/compiled
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
+%config(missingok) /etc/security/console.apps/xserver
%{_mandir}/man1/Xorg.1x*
%{_mandir}/man1/Xserver.1x*
-%{_mandir}/man1/getconfig.1x*
+%{_mandir}/man1/cvt.1*
%{_mandir}/man1/gtf.1x*
%{_mandir}/man1/pcitweak.1x*
%{_mandir}/man1/scanpci.1x*
%{_mandir}/man1/xorgcfg.1x*
%{_mandir}/man1/xorgconfig.1*
+%{_mandir}/man4/exa.4*
%{_mandir}/man4/fbdevhw.4*
-%{_mandir}/man5/getconfig.5x*
%{_mandir}/man5/xorg.conf.5x*
%files -n xorg-xserver-Xdmx
%files devel
%defattr(644,root,root,755)
%{_includedir}/xorg
+%{_libdir}/libxf86config.a
%{_aclocaldir}/xorg-server.m4
%{_pkgconfigdir}/xorg-server.pc
+
+%files -n xorg-xserver-libglx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
projects / packages / xorg-xserver-server.git / blobdiff