SPECS: xorg-xserver-server.spec - build xorgcfg again, but moved t...

[qboosh]

Author: qboosh                       Date: Thu Sep  6 18:03:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build xorgcfg again, but moved to subpackage (more deps)
- added ChangeLog to doc

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.103 SPECS/xorg-xserver-server.spec:1.104
--- SPECS/xorg-xserver-server.spec:1.103	Thu Sep  6 18:50:18 2007
+++ SPECS/xorg-xserver-server.spec	Thu Sep  6 20:02:57 2007
@@ -90,14 +90,10 @@
 # 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}
@@ -235,6 +231,27 @@
 %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
@@ -300,7 +317,6 @@
         exit 1
 fi
 
-
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -316,6 +332,7 @@
 	--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" \
@@ -346,7 +363,7 @@
 
 %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
@@ -440,6 +457,14 @@
 %{_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
@@ -450,6 +475,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2007/09/06 18:02:57  qboosh
+- build xorgcfg again, but moved to subpackage (more deps)
+- added ChangeLog to doc
+
 Revision 1.103  2007/09/06 16:50:18  arekm
 - move xf86Module.h note to where it's needed
 
================================================================

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