SPECS: xorg-xserver-server.spec - xorgcfg dropped upstream, drop obsolete o...

[arekm]

Author: arekm                        Date: Fri Nov 28 07:48:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- xorgcfg dropped upstream, drop obsolete options; this snap doesn't build, new one on monday

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.153 SPECS/xorg-xserver-server.spec:1.154
--- SPECS/xorg-xserver-server.spec:1.153	Wed Nov 26 13:17:35 2008
+++ SPECS/xorg-xserver-server.spec	Fri Nov 28 08:48:43 2008
@@ -2,10 +2,9 @@
 #
 # Conditional build:
 %bcond_with	multigl	# package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
-%bcond_with	dri2	# DRI2 support
+%bcond_without	dri2	# DRI2 support
 %bcond_without	hal	# HAL support
 %bcond_with	record	# RECORD extension
-%bcond_with	xtrap	# XTrap extension (deprecated)
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define	xorg_xserver_server_ansic_abi		0.4
@@ -77,7 +76,7 @@
 BuildRequires:	xorg-proto-fontcacheproto-devel
 BuildRequires:	xorg-proto-fontsproto-devel
 BuildRequires:	xorg-proto-glproto-devel >= 1.4.8
-BuildRequires:	xorg-proto-inputproto-devel >= 1.9.99.6
+BuildRequires:	xorg-proto-inputproto-devel >= 1.5.0
 BuildRequires:	xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires:	xorg-proto-printproto-devel
 BuildRequires:	xorg-proto-randrproto-devel >= 1.2
@@ -85,7 +84,6 @@
 BuildRequires:	xorg-proto-renderproto-devel >= 0.9.3
 BuildRequires:	xorg-proto-resourceproto-devel
 BuildRequires:	xorg-proto-scrnsaverproto-devel >= 1.1.0
-%{?with_xtrap:BuildRequires:	xorg-proto-trapproto-devel}
 BuildRequires:	xorg-proto-videoproto-devel
 BuildRequires:	xorg-proto-xcmiscproto-devel
 BuildRequires:	xorg-proto-xextproto-devel >= 7.0.3
@@ -122,6 +120,7 @@
 Obsoletes:	XFree86-modules < 1:7.0.0
 Obsoletes:	XFree86-setup < 1:7.0.0
 Obsoletes:	Xserver
+Obsoletes:	xorg-xserver-server-xorgcfg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # avoid self-dependencies on included modules
@@ -246,27 +245,6 @@
 %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
@@ -343,11 +321,7 @@
 	--enable-install-libxf86config \
 	%{?with_record:--enable-record} \
 	--enable-secure-rpc \
-	--enable-xevie \
-	--enable-xorgcfg \
-	%{?with_xtrap:--enable-xtrap} \
 	--%{?with_dri2:en}%{!?with_dri2:dis}able-dri2 \
-	--disable-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" \
 	--with-xkb-output=/var/lib/xkb
@@ -391,9 +365,7 @@
 %if %{without record}
 	sed -i -e 's/^\s*Load\s*"record".*$/#& # module disabled in this build/' /etc/X11/xorg.conf
 %endif
-%if %{without xtrap}
 	sed -i -e 's/^\s*Load\s*"xtrap".*$/#& # deprecated module, disabled/' /etc/X11/xorg.conf
-%endif
 fi
 
 %files
@@ -421,7 +393,6 @@
 %{?with_dri2:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri2.so}
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
 %{?with_record:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so}
-%{?with_xtrap:%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
@@ -480,14 +451,6 @@
 %{_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)
 %if %{with multigl}
@@ -503,6 +466,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2008/11/28 07:48:43  arekm
+- xorgcfg dropped upstream, drop obsolete options; this snap doesn't build, new one on monday
+
 Revision 1.153  2008/11/26 12:17:35  arekm
 - upcoming xserver 1.6 beta (Th uses 1.5 from XORG_XSERVER_1_5)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.153&r2=1.154&f=u