packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - xorg confi...

[baggins]

Author: baggins                      Date: Mon Feb  6 21:33:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- xorg configs in driver package

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.256 -> 1.257) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.256 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.257
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.256	Mon Feb  6 21:54:50 2012
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Mon Feb  6 22:33:16 2012
@@ -65,6 +65,7 @@
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	X11-driver-firegl < 1:7.0.0
 Obsoletes:	XFree86-driver-firegl < 1:7.0.0
+Obsoletes:	xorg-driver-video-fglrx-config
 Obsoletes:	xorg-driver-video-fglrx-libdri
 Obsoletes:	xorg-driver-video-fglrx-libglx
 ExclusiveArch:	i586 i686 athlon pentium3 pentium4 %{x8664}
@@ -160,22 +161,6 @@
 informującą sterownik poprzez interfejs rozszerzeń X, że zaszło
 zdarzenie.
 
-%package config
-Summary:	Xorg configuration file to use fglrx module
-Summary(pl.UTF-8):	Plik konfiguracyjny modułu fglrx dla Xorg
-Group:		X11
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description config
-Without configuration file Xorg doesn't use fglrx module. If you want
-to use it you should install this package or create own configuration
-file.
-
-%description config -l pl.UTF-8
-Bez odpowiedniej konfiguracji Xorg nie będzie używał modułu fglrx. Aby
-to umożliwić należy zainstalować tą paczkę lub stworzyć własny plik
-konfiguracyjny.
-
 %package -n kernel%{_alt_kernel}-video-firegl
 Summary:	ATI kernel module for FireGL support
 Summary(pl.UTF-8):	Moduł jądra oferujący wsparcie dla ATI FireGL
@@ -341,6 +326,8 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/linux/libfglrxdrm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/amdxmm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/glesx.so
+%{_sysconfdir}/X11/xorg.conf.d/10-fglrx.conf
+%{_sysconfdir}/X11/xorg.conf.d/10-fglrx-modules.conf
 
 %files libs
 %defattr(644,root,root,755)
@@ -389,11 +376,6 @@
 %attr(755,root,root) %{_sysconfdir}/acpi/ati-powermode.sh
 %{_sysconfdir}/acpi/events/*
 %{_mandir}/man8/atieventsd.8*
-
-%files config
-%defattr(644,root,root,755)
-%{_sysconfdir}/X11/xorg.conf.d/10-fglrx.conf
-%{_sysconfdir}/X11/xorg.conf.d/10-fglrx-modules.conf
 %endif
 
 %if %{with kernel}
@@ -408,6 +390,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.257  2012/02/06 21:33:16  baggins
+- xorg configs in driver package
+
 Revision 1.256  2012/02/06 20:54:50  baggins
 - rel 5
 - dropped multigl bcond and all the hacks around it,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.256&r2=1.257&f=u