SPECS (AC-branch): freeglut.spec - HEAD merge: obsoletes: glut* (w...

[hawk]

Author: hawk                         Date: Sun Mar  4 13:05:00 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge: obsoletes: glut* (well, at least main library; no mui or
  Fortran bindings here)

---- Files affected:
SPECS:
   freeglut.spec (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: SPECS/freeglut.spec
diff -u SPECS/freeglut.spec:1.1 SPECS/freeglut.spec:1.1.2.1
--- SPECS/freeglut.spec:1.1	Mon Oct 31 14:37:45 2005
+++ SPECS/freeglut.spec	Sun Mar  4 14:04:55 2007
@@ -13,6 +13,7 @@
 # libX11, libXext, libXxf86vm
 BuildRequires:	XFree86-devel
 Provides:	OpenGL-glut = 3.7
+Obsoletes:	glut
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,6 +46,7 @@
 Requires:	OpenGL-GLU-devel
 Requires:	XFree86-devel
 Provides:	OpenGL-glut-devel = 3.7
+Obsoletes:	glut-devel
 
 %description devel
 Header files for freeglut library.
@@ -58,6 +60,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Provides:	OpenGL-glut-static = 3.7
+Obsoletes:	glut-static
 
 %description static
 Static freeglut library.
@@ -108,6 +111,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.1  2007/03/04 13:04:55  hawk
+- HEAD merge: obsoletes: glut* (well, at least main library; no mui or
+  Fortran bindings here)
+
 Revision 1.1  2005/10/31 13:37:45  qboosh
 - new
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/freeglut.spec?r1=1.1&r2=1.1.2.1&f=u