SPECS: metapackage-xorg.spec - almost works

[arekm]

Author: arekm                        Date: Sat Dec 23 15:20:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- almost works

---- Files affected:
SPECS:
   metapackage-xorg.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/metapackage-xorg.spec
diff -u SPECS/metapackage-xorg.spec:1.3 SPECS/metapackage-xorg.spec:1.4
--- SPECS/metapackage-xorg.spec:1.3	Sat Dec 23 16:10:02 2006
+++ SPECS/metapackage-xorg.spec	Sat Dec 23 16:20:44 2006
@@ -234,10 +234,10 @@
 Provides:	XFree86-devel = %{epoch}:%{version}-%{release}
 # common obsoletes
 Obsoletes:	X11-DPS-devel
-Obsoletes:	XFree86-DPS-devel
 Obsoletes:	X11-OpenGL-devel
-Obsoletes:	XFree86-OpenGL-devel
 Obsoletes:	X11-OpenGL-devel-base
+Obsoletes:	XFree86-DPS-devel
+Obsoletes:	XFree86-OpenGL-devel
 Obsoletes:	XFree86-OpenGL-devel-base
 
 %description -n X11-devel
@@ -270,14 +270,28 @@
 Summary:	driver-ati package that allows easier X11->xorg upgrade
 Group:		X11
 Requires:	xorg-driver-video-ati
-Provides:	X11-driver-r128 = %{epoch}:%{version}-%{release}
-Provides:	X11-driver-radeon = %{epoch}:%{version}-%{release}
 Provides:	XFree86-driver-ati = %{epoch}:%{version}-%{release}
-Obsoletes:	X11-driver-r128
-Obsoletes:	X11-driver-radeon
 
 %description -n X11-driver-ati
 
+%package -n X11-driver-radeon
+Summary:	driver-radeon package that allows easier X11->xorg upgrade
+Group:		X11
+Requires:	xorg-driver-video-ati
+Provides:	X11-driver-radeon = %{epoch}:%{version}-%{release}
+Provides:	XFree86-driver-radeon = %{epoch}:%{version}-%{release}
+
+%description -n X11-driver-radeon
+
+%package -n X11-driver-r128
+Summary:	driver-r128 package that allows easier X11->xorg upgrade
+Group:		X11
+Requires:	xorg-driver-video-ati
+Provides:	X11-driver-r128 = %{epoch}:%{version}-%{release}
+Provides:	XFree86-driver-r128 = %{epoch}:%{version}-%{release}
+
+%description -n X11-driver-r128
+
 %package -n X11-driver-r128-dri
 Summary:	driver-r128-dri package that allows easier X11->xorg upgrade
 Group:		X11
@@ -638,13 +652,13 @@
 # Rest of libs deps will be fetched on per so-name rule.
 # Common obsoletes:
 Obsoletes:	X11-DPS
-Obsoletes:	XFree86-DPS
-Obsoletes:	X11-common
-Obsoletes:	XFree86-common
 Obsoletes:	X11-OpenGL-core
-Obsoletes:	XFree86-OpenGL-core
 Obsoletes:	X11-OpenGL-libGL
+Obsoletes:	X11-common
+Obsoletes:	XFree86-DPS
+Obsoletes:	XFree86-OpenGL-core
 Obsoletes:	XFree86-OpenGL-libGL
+Obsoletes:	XFree86-common
 
 %description -n X11-libs
 
@@ -711,8 +725,8 @@
 Provides:	XFree86-static = %{epoch}:%{version}-%{release}
 # common obsoletes
 Obsoletes:	X11-DPS-static
-Obsoletes:	XFree86-DPS-static
 Obsoletes:	X11-OpenGL-static
+Obsoletes:	XFree86-DPS-static
 Obsoletes:	XFree86-OpenGL-static
 
 %description -n X11-static
@@ -756,6 +770,13 @@
 Requires:	xorg-app-xtrap
 Requires:	xorg-app-xwininfo
 Provides:	XFree86-tools = %{epoch}:%{version}-%{release}
+# common obsoletes
+Obsoletes:	X11-DPS
+Obsoletes:	X11-DPS-devel
+Obsoletes:	X11-DPS-static
+Obsoletes:	XFree86-DPS
+Obsoletes:	XFree86-DPS-devel
+Obsoletes:	XFree86-DPS-static
 
 %description -n X11-tools
 
@@ -808,6 +829,33 @@
 
 %description -n X11-xfs
 
+%package -n X11-fonts
+Summary:	fonts package that allows easier X11->xorg upgrade
+Group:		X11
+Requires:	xorg-font-encodings
+Requires:	xorg-font-font-adobe-utopia-type1
+Requires:	xorg-font-font-arabic-misc
+Requires:	xorg-font-font-bh-ttf
+Requires:	xorg-font-font-bh-type1
+Requires:	xorg-font-font-bitstream-type1
+Requires:	xorg-font-font-daewoo-misc
+Requires:	xorg-font-font-dec-misc
+Requires:	xorg-font-font-ibm-type1
+Requires:	xorg-font-font-isas-misc
+Requires:	xorg-font-font-micro-misc
+Requires:	xorg-font-font-misc-ethiopic
+Requires:	xorg-font-font-misc-meltho
+Requires:	xorg-font-font-misc-misc
+Requires:	xorg-font-font-mutt-misc
+Requires:	xorg-font-font-schumacher-misc
+Requires:	xorg-font-font-sony-misc
+Requires:	xorg-font-font-sun-misc
+Requires:	xorg-font-font-xfree86-type1
+Provides:	XFree86-fonts = %{epoch}:%{version}-%{release}
+
+%description -n X11-fonts
+
+
 %package -n X11-fonts-base
 Summary:	fonts-base package that allows easier X11->xorg upgrade
 Group:		X11
@@ -854,6 +902,10 @@
 %defattr(644,root,root,755)
 #%files -n X11-driver-ati
 #%defattr(644,root,root,755)
+%files -n X11-driver-radeon
+%defattr(644,root,root,755)
+%files -n X11-driver-r128
+%defattr(644,root,root,755)
 %files -n X11-driver-r128-dri
 %defattr(644,root,root,755)
 %files -n X11-driver-radeon-dri
@@ -962,8 +1014,10 @@
 #%defattr(644,root,root,755)
 #%files -n X11-xfs
 #%defattr(644,root,root,755)
-%files -n X11-fonts-base
+%files -n X11-fonts
 %defattr(644,root,root,755)
+#%files -n X11-fonts-base
+#%defattr(644,root,root,755)
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -971,6 +1025,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/12/23 15:20:44  arekm
+- almost works
+
 Revision 1.3  2006/12/23 15:10:02  arekm
 - well; it can be usefull sometimes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/metapackage-xorg.spec?r1=1.3&r2=1.4&f=u