- sorted Rs

[packages/xorg-xserver-server.git] / xorg-xserver-server.spec

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index a8cf26923b02bda73e908405546d95c2ed3da223..b8c0c2ef3086980de03a1a37103c5bce91309be2 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -1,8 +1,16 @@
+
+# ABI versions, see hw/xfree86/common/xf86Module.h
+%define        xorg_xserver_server_ansic_abi           0.3
+%define        xorg_xserver_server_extension_abi       0.3
+%define        xorg_xserver_server_font_abi            0.5
+%define        xorg_xserver_server_videodrv_abi        2.0
+%define        xorg_xserver_server_xinput_abi          2.0
+
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
 Version:       1.4
-Release:       1
+Release:       3
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -16,6 +24,7 @@ Patch1:               %{name}-xwrapper.patch
 # nasty hack for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
 Patch2:                %{name}-gcc-x86_64-workaround.patch
 Patch3:                %{name}-link.patch
+Patch4:                %{name}-dbus.patch
 URL:           http://xorg.freedesktop.org/
 # for glx headers
 BuildRequires: OpenGL-GLX-devel
@@ -83,20 +92,17 @@ BuildRequires:      xorg-proto-xf86vidmodeproto-devel
 BuildRequires: xorg-proto-xineramaproto-devel
 BuildRequires: xorg-proto-xproto-devel >= 7.0.9
 BuildRequires: xorg-util-util-macros >= 0.99.2
-# xcalibrateproto, tslib (for KDRIVE only)
+#BR: xcalibrateproto, tslib (for KDRIVE only)
+#BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
+Requires:      pixman >= 0.9.5
 Requires:      xkeyboard-config
-# 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
 # xserver requires fixed and cursor 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
 Provides:      xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
 Provides:      xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_abi}
 Provides:      xorg-xserver-server(font-abi) = %{xorg_xserver_server_font_abi}
@@ -234,6 +240,27 @@ Header files for X.org server.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe dla serwera X.org.
 
+%package xorgcfg
+Summary:       xorgcfg - graphical configuration tool for X.org server
+Summary(pl.UTF-8):     xorgcfg - graficzne narzędzie konfiguracyjne dla serwera X.org
+Group:         X11/Servers
+Requires:      %{name} = %{version}-%{release}
+# just for %{_includedir}/bitmaps dir?
+Requires:      xorg-data-xbitmaps
+# for new app-defaults location
+Requires:      xorg-lib-libXt >= 1.0.0
+Requires:      xorg-lib-libxkbui >= 1.0.2
+
+%description xorgcfg
+xorgcfg is a tool to configure X.org server, and can be used to either
+write the initial configuration file or make customizations to the
+current configuration.
+
+%description xorgcfg -l pl.UTF-8
+xorgcfg to narzędzie do konfiguracji serwera X.org. Można go użyć do
+utworzenia początkowego pliku konfiguracyjnego lub dokonania
+modyfikacji istniejącej konfiguracji.
+
 %package -n xorg-xserver-libglx
 Summary:       GLX extension library fo X.org server
 Summary(pl.UTF-8):     Biblioteka rozszerzenia GLX dla serwera X.org
@@ -251,13 +278,6 @@ GLX extension library fo X.org server.
 %description -n xorg-xserver-libglx -l pl.UTF-8
 Biblioteka rozszerzenia GLX dla serwera X.org.
 
-# see hw/xfree86/common/xf86Module.h
-%define        xorg_xserver_server_ansic_abi           0.3
-%define        xorg_xserver_server_extension_abi       0.3
-%define        xorg_xserver_server_font_abi            0.5
-%define        xorg_xserver_server_videodrv_abi        2.0
-%define        xorg_xserver_server_xinput_abi          2.0
-
 %prep
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
@@ -266,6 +286,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch2 -p1
 %endif
 %patch3 -p1
+%patch4 -p0
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -299,7 +320,6 @@ if API=$(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d"
         exit 1
 fi
 
-
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -315,6 +335,7 @@ fi
        --enable-glx-tls \
        --enable-lbx \
        --enable-xevie \
+       --enable-xorgcfg \
        --enable-xprint \
        --with-dri-driver-path=%{_libdir}/xorg/modules/dri \
        --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
@@ -345,7 +366,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING
+%doc COPYING ChangeLog
 %attr(755,root,root) %{_bindir}/X
 %attr(755,root,root) %{_bindir}/Xorg
 %attr(4755,root,root) %{_bindir}/Xwrapper
@@ -439,6 +460,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_aclocaldir}/xorg-server.m4
 %{_pkgconfigdir}/xorg-server.pc
 
+%files xorgcfg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xorgcfg
+%{_includedir}/X11/bitmaps/*
+%{_includedir}/X11/pixmaps
+%{_datadir}/X11/app-defaults/XOrgCfg
+%{_mandir}/man1/xorgcfg.1x*
+
 %files -n xorg-xserver-libglx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so