SPECS: xorg-lib-libICE.spec, xorg-lib-libSM.spec, xorg-lib-libX11....

qboosh qboosh at pld-linux.org
Wed Aug 17 22:10:53 CEST 2005


Author: qboosh                       Date: Wed Aug 17 20:10:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Obsoletes for old xlibs or separate packages

---- Files affected:
SPECS:
   xorg-lib-libICE.spec (1.1 -> 1.2) , xorg-lib-libSM.spec (1.1 -> 1.2) , xorg-lib-libX11.spec (1.1 -> 1.2) , xorg-lib-libXau.spec (1.1 -> 1.2) , xorg-lib-libXaw.spec (1.1 -> 1.2) , xorg-lib-libXcomposite.spec (1.1 -> 1.2) , xorg-lib-libXcursor.spec (1.1 -> 1.2) , xorg-lib-libXdamage.spec (1.1 -> 1.2) , xorg-lib-libXdmcp.spec (1.1 -> 1.2) , xorg-lib-libXext.spec (1.1 -> 1.2) , xorg-lib-libXfixes.spec (1.1 -> 1.2) , xorg-lib-libXfont.spec (1.1 -> 1.2) , xorg-lib-libXft.spec (1.1 -> 1.2) , xorg-lib-libXinerama.spec (1.1 -> 1.2) , xorg-lib-libXi.spec (1.1 -> 1.2) , xorg-lib-libXmu.spec (1.1 -> 1.2) , xorg-lib-libXpm.spec (1.1 -> 1.2) , xorg-lib-libXp.spec (1.1 -> 1.2) , xorg-lib-libXrandr.spec (1.1 -> 1.2) , xorg-lib-libXrender.spec (1.1 -> 1.2) , xorg-lib-libXres.spec (1.1 -> 1.2) , xorg-lib-libXt.spec (1.1 -> 1.2) , xorg-lib-libXtst.spec (1.1 -> 1.2) , xorg-lib-libXv.spec (1.1 -> 1.2) , xorg-proto-xproto.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/xorg-lib-libICE.spec
diff -u SPECS/xorg-lib-libICE.spec:1.1 SPECS/xorg-lib-libICE.spec:1.2
--- SPECS/xorg-lib-libICE.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libICE.spec	Wed Aug 17 22:10:46 2005
@@ -17,6 +17,7 @@
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
 BuildRequires:	xorg-lib-xtrans-devel
+Obsoletes:	libICE
 BuildRoot:	%{tmpdir}/libICE-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -34,6 +35,7 @@
 Group:		X11/Development/Libraries
 Requires:	xorg-lib-libICE = %{version}-%{release}
 Requires:	xorg-proto-xproto-devel
+Obsoletes:	libICE-devel
 
 %description devel
 Inter Client Exchange library.
@@ -53,6 +55,7 @@
 Summary(pl):	Biblioteki statyczne libICE
 Group:		Development/Libraries
 Requires:	xorg-lib-libICE-devel = %{version}-%{release}
+Obsoletes:	libICE-static
 
 %description static
 Inter Client Exchange library.
@@ -115,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libSM.spec
diff -u SPECS/xorg-lib-libSM.spec:1.1 SPECS/xorg-lib-libSM.spec:1.2
--- SPECS/xorg-lib-libSM.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libSM.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,7 @@
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
 BuildRequires:	xorg-lib-xtrans-devel
+Obsoletes:	libSM
 BuildRoot:	%{tmpdir}/libSM-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -35,6 +36,7 @@
 Group:		X11/Development/Libraries
 Requires:	xorg-lib-libSM = %{version}-%{release}
 Requires:	xorg-lib-libICE-devel
+Obsoletes:	libSM-devel
 
 %description devel
 Session Management library.
@@ -54,6 +56,7 @@
 Summary(pl):	Biblioteki statyczne libSM
 Group:		Development/Libraries
 Requires:	xorg-lib-libSM-devel = %{version}-%{release}
+Obsoletes:	libSM-static
 
 %description static
 Session Management library.
@@ -116,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libX11.spec
diff -u SPECS/xorg-lib-libX11.spec:1.1 SPECS/xorg-lib-libX11.spec:1.2
--- SPECS/xorg-lib-libX11.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libX11.spec	Wed Aug 17 22:10:46 2005
@@ -25,6 +25,7 @@
 BuildRequires:	xorg-proto-xextproto-devel
 BuildRequires:	xorg-proto-xf86bigfontproto-devel
 BuildRequires:	xorg-lib-xtrans-devel
+Obsoletes:	libX11
 BuildRoot:	%{tmpdir}/libX11-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -45,6 +46,7 @@
 Requires:	xorg-proto-kbproto-devel
 Requires:	xorg-lib-libXau-devel
 Requires:	xorg-lib-libXdmcp-devel
+Obsoletes:	libX11-devel
 
 %description devel
 X11 Base library.
@@ -64,6 +66,7 @@
 Summary(pl):	Biblioteki statyczne libX11
 Group:		Development/Libraries
 Requires:	xorg-lib-libX11-devel = %{version}-%{release}
+Obsoletes:	libX11-static
 
 %description static
 X11 Base library.
@@ -132,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXau.spec
diff -u SPECS/xorg-lib-libXau.spec:1.1 SPECS/xorg-lib-libXau.spec:1.2
--- SPECS/xorg-lib-libXau.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXau.spec	Wed Aug 17 22:10:46 2005
@@ -17,6 +17,7 @@
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
 BuildRequires:	xorg-proto-xproto-devel
+Obsoletes:	libXau
 BuildRoot:	%{tmpdir}/libXau-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -35,6 +36,7 @@
 Group:		X11/Development/Libraries
 Requires:	xorg-lib-libXau = %{version}-%{release}
 Requires:	xorg-proto-xproto-devel
+Obsoletes:	libXau-devel
 
 %description devel
 Xau - Authorization Protocol for X.
@@ -54,6 +56,7 @@
 Summary(pl):	Biblioteki statyczne libXau
 Group:		Development/Libraries
 Requires:	xorg-lib-libXau-devel = %{version}-%{release}
+Obsoletes:	libXau-static
 
 %description static
 Xau - Authorization Protocol for X.
@@ -119,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXaw.spec
diff -u SPECS/xorg-lib-libXaw.spec:1.1 SPECS/xorg-lib-libXaw.spec:1.2
--- SPECS/xorg-lib-libXaw.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXaw.spec	Wed Aug 17 22:10:46 2005
@@ -19,6 +19,7 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	libXaw
 BuildRoot:	%{tmpdir}/libXaw-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -39,6 +40,7 @@
 Requires:	xorg-lib-libXmu-devel
 Requires:	xorg-lib-libXp-devel
 Requires:	xorg-lib-libXpm-devel
+Obsoletes:	libXaw-devel
 
 %description devel
 X Athena Widgets library.
@@ -58,6 +60,7 @@
 Summary(pl):	Biblioteki statyczne libXaw
 Group:		Development/Libraries
 Requires:	xorg-lib-libXaw-devel = %{version}-%{release}
+Obsoletes:	libXaw-static
 
 %description static
 X Athena Widgets library.
@@ -124,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXcomposite.spec
diff -u SPECS/xorg-lib-libXcomposite.spec:1.1 SPECS/xorg-lib-libXcomposite.spec:1.2
--- SPECS/xorg-lib-libXcomposite.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXcomposite.spec	Wed Aug 17 22:10:46 2005
@@ -19,6 +19,7 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	libXcomposite
 BuildRoot:	%{tmpdir}/libXcomposite-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -38,6 +39,7 @@
 Requires:	xorg-proto-compositeproto-devel
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXfixes-devel
+Obsoletes:	libXcomposite-devel
 
 %description devel
 X Composite extension library.
@@ -57,6 +59,7 @@
 Summary(pl):	Biblioteki statyczne libXcomposite
 Group:		Development/Libraries
 Requires:	xorg-lib-libXcomposite-devel = %{version}-%{release}
+Obsoletes:	libXcomposite-static
 
 %description static
 X Composite extension library.
@@ -120,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXcursor.spec
diff -u SPECS/xorg-lib-libXcursor.spec:1.1 SPECS/xorg-lib-libXcursor.spec:1.2
--- SPECS/xorg-lib-libXcursor.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXcursor.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,9 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	XFree86-xcursor
+Obsoletes:	libXcursor
+Obsoletes:	xcursor
 BuildRoot:	%{tmpdir}/libXcursor-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -37,6 +40,9 @@
 Requires:	xorg-lib-libXcursor = %{version}-%{release}
 Requires:	xorg-lib-libXfixes-devel
 Requires:	xorg-lib-libXrender-devel
+Obsoletes:	XFree86-xcursor-devel
+Obsoletes:	libXcursor-devel
+Obsoletes:	xcursor-devel
 
 %description devel
 X Cursor - client-side cursor loading library.
@@ -56,6 +62,9 @@
 Summary(pl):	Biblioteki statyczne libXcursor
 Group:		Development/Libraries
 Requires:	xorg-lib-libXcursor-devel = %{version}-%{release}
+Obsoletes:	XFree86-xcursor-static
+Obsoletes:	libXcursor-static
+Obsoletes:	xcursor-static
 
 %description static
 X Cursor - client-side cursor loading library.
@@ -120,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXdamage.spec
diff -u SPECS/xorg-lib-libXdamage.spec:1.1 SPECS/xorg-lib-libXdamage.spec:1.2
--- SPECS/xorg-lib-libXdamage.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXdamage.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,7 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	libXdamage
 BuildRoot:	%{tmpdir}/libXdamage-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -36,6 +37,7 @@
 Requires:	xorg-lib-libXdamage = %{version}-%{release}
 Requires:	xorg-proto-damageproto-devel
 Requires:	xorg-lib-libXfixes-devel
+Obsoletes:	libXdamage-devel
 
 %description devel
 X Damage extension library.
@@ -55,6 +57,7 @@
 Summary(pl):	Biblioteki statyczne libXdamage
 Group:		Development/Libraries
 Requires:	xorg-lib-libXdamage-devel = %{version}-%{release}
+Obsoletes:	libXdamage-static
 
 %description static
 X Damage extension library.
@@ -118,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXdmcp.spec
diff -u SPECS/xorg-lib-libXdmcp.spec:1.1 SPECS/xorg-lib-libXdmcp.spec:1.2
--- SPECS/xorg-lib-libXdmcp.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXdmcp.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,7 @@
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
 BuildRequires:	xorg-proto-xproto-devel
+Obsoletes:	libXdmcp
 BuildRoot:	%{tmpdir}/libXdmcp-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -35,6 +36,7 @@
 Group:		X11/Development/Libraries
 Requires:	xorg-lib-libXdmcp = %{version}-%{release}
 Requires:	xorg-proto-xproto-devel
+Obsoletes:	libXdmcp-devel
 
 %description devel
 X Display Manager Control Protocol library.
@@ -54,6 +56,7 @@
 Summary(pl):	Biblioteki statyczne libXdmcp
 Group:		Development/Libraries
 Requires:	xorg-lib-libXdmcp-devel = %{version}-%{release}
+Obsoletes:	libXdmcp-static
 
 %description static
 X Display Manager Control Protocol library.
@@ -120,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXext.spec
diff -u SPECS/xorg-lib-libXext.spec:1.1 SPECS/xorg-lib-libXext.spec:1.2
--- SPECS/xorg-lib-libXext.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXext.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,7 @@
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
 BuildRequires:	xorg-proto-xextproto-devel
+Obsoletes:	libXext
 BuildRoot:	%{tmpdir}/libXext-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -37,6 +38,7 @@
 Requires:	xorg-lib-libXext = %{version}-%{release}
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-proto-xextproto-devel
+Obsoletes:	libXext-devel
 
 %description devel
 X extension library.
@@ -56,6 +58,7 @@
 Summary(pl):	Biblioteki statyczne libXext
 Group:		Development/Libraries
 Requires:	xorg-lib-libXext-devel = %{version}-%{release}
+Obsoletes:	libXext-static
 
 %description static
 X extension library.
@@ -119,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXfixes.spec
diff -u SPECS/xorg-lib-libXfixes.spec:1.1 SPECS/xorg-lib-libXfixes.spec:1.2
--- SPECS/xorg-lib-libXfixes.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXfixes.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,7 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	libXfixes
 BuildRoot:	%{tmpdir}/libXfixes-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -37,6 +38,7 @@
 Requires:	xorg-lib-libXfixes = %{version}-%{release}
 Requires:	xorg-proto-fixesproto-devel
 Requires:	xorg-lib-libX11-devel
+Obsoletes:	libXfixes-devel
 
 %description devel
 X Fixes extension library.
@@ -56,6 +58,7 @@
 Summary(pl):	Biblioteki statyczne libXfixes
 Group:		Development/Libraries
 Requires:	xorg-lib-libXfixes-devel = %{version}-%{release}
+Obsoletes:	libXfixes-static
 
 %description static
 X Fixes extension library.
@@ -120,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXfont.spec
diff -u SPECS/xorg-lib-libXfont.spec:1.1 SPECS/xorg-lib-libXfont.spec:1.2
--- SPECS/xorg-lib-libXfont.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXfont.spec	Wed Aug 17 22:10:46 2005
@@ -22,6 +22,7 @@
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
 BuildRequires:	xorg-lib-xtrans-devel
+Obsoletes:	libXfont
 BuildRoot:	%{tmpdir}/libXfont-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -43,6 +44,7 @@
 Requires:	freetype-devel
 Requires:	xorg-lib-libfontenc-devel
 Requires:	xorg-lib-xtrans-devel
+Obsoletes:	libXfont-devel
 
 
 %description devel
@@ -63,6 +65,7 @@
 Summary(pl):	Biblioteki statyczne libXfont
 Group:		Development/Libraries
 Requires:	xorg-lib-libXfont-devel = %{version}-%{release}
+Obsoletes:	libXfont-static
 
 %description static
 X font libary used by the X server.
@@ -135,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXft.spec
diff -u SPECS/xorg-lib-libXft.spec:1.1 SPECS/xorg-lib-libXft.spec:1.2
--- SPECS/xorg-lib-libXft.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXft.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,11 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	XFree86-xft
+Obsoletes:	XFree86-xft2
+Obsoletes:	Xft
+Obsoletes:	libXft
+Obsoletes:	xft
 BuildRoot:	%{tmpdir}/libXft-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -37,6 +42,11 @@
 Requires:	xorg-lib-libXft = %{version}-%{release}
 Requires:	fontconfig-devel
 Requires:	xorg-lib-libXrender-devel
+Obsoletes:	XFree86-xft-devel
+Obsoletes:	XFree86-xft2-devel
+Obsoletes:	Xft-devel
+Obsoletes:	libXft-devel
+Obsoletes:	xft-devel
 
 %description devel
 Xft is a font rendering library for X.
@@ -56,6 +66,10 @@
 Summary(pl):	Biblioteki statyczne libXft
 Group:		Development/Libraries
 Requires:	xorg-lib-libXft-devel = %{version}-%{release}
+Obsoletes:	XFree86-xft-static
+Obsoletes:	Xft-static
+Obsoletes:	libXft-static
+Obsoletes:	xft-static
 
 %description static
 Xft is a font rendering library for X.
@@ -122,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/

================================================================
Index: SPECS/xorg-lib-libXinerama.spec
diff -u SPECS/xorg-lib-libXinerama.spec:1.1 SPECS/xorg-lib-libXinerama.spec:1.2
--- SPECS/xorg-lib-libXinerama.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXinerama.spec	Wed Aug 17 22:10:46 2005
@@ -18,6 +18,7 @@
 BuildRequires:	xorg-proto-panoramixproto-devel
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	libXinerama
 BuildRoot:	%{tmpdir}/libXinerama-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -36,6 +37,7 @@
 Requires:	xorg-lib-libXinerama = %{version}-%{release}
 Requires:	xorg-lib-libXext-devel
 Requires:	xorg-proto-panoramixproto-devel
+Obsoletes:	libXinerama-devel
 
 %description devel
 Xinerama extension library.
@@ -55,6 +57,7 @@
 Summary(pl):	Biblioteki statyczne libXinerama
 Group:		Development/Libraries
 Requires:	xorg-lib-libXinerama-devel = %{version}-%{release}
+Obsoletes:	libXinerama-static
 
 %description static
 Xinerama extension library.
@@ -115,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/08/17 20:10:46  qboosh
+- Obsoletes for old xlibs or separate packages
+
 Revision 1.1  2005/08/15 12:17:57  arekm
 - new try
 - all xorg files prefixed with xorg-kind_of_package where kind of package can be seen at http://xorg.freedesktop.org/X11R7.0-RC0/
@@ -127,4 +133,3 @@
 
 Revision 1.1  2004/05/22 23:43:44  qboosh
 - new, untested
-

================================================================
Index: SPECS/xorg-lib-libXi.spec
diff -u SPECS/xorg-lib-libXi.spec:1.1 SPECS/xorg-lib-libXi.spec:1.2
--- SPECS/xorg-lib-libXi.spec:1.1	Mon Aug 15 14:17:57 2005
+++ SPECS/xorg-lib-libXi.spec	Wed Aug 17 22:10:46 2005
@@ -17,6 +17,7 @@
 BuildRequires:	libtool
 BuildRequires:	pkg-config
 BuildRequires:	xorg-util-util-macros
+Obsoletes:	libXi
 BuildRoot:	%{tmpdir}/libXi-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -35,6 +36,7 @@
 Group:		X11/Development/Libraries
 Requires:	xorg-lib-libXi = %{version}-%{release}
 Requires:	xorg-lib-libXext-devel
+Obsoletes:	libXi-devel
 
 %description devel
 X Input extension library.
@@ -54,6 +56,7 @@
 Summary(pl):	Biblioteki statyczne libXi
 Group:		Development/Libraries
 Requires:	xorg-lib-libXi-devel = %{version}-%{release}
+Obsoletes:	libXi-static
 
 %description static
 X Input extension library.
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-lib-libICE.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libSM.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXau.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXaw.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXcomposite.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXcursor.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXdamage.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXdmcp.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXext.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXfixes.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXfont.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXft.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXinerama.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXi.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXmu.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXpm.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXp.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXrandr.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXrender.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXres.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXt.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXtst.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-lib-libXv.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/xorg-proto-xproto.spec?r1=1.1&r2=1.2&f=u




More information about the pld-cvs-commit mailing list