Accepting request 138907 from home:jengelh:branches:X11:XOrg

- Add Obsoletes/Provides for Mesa-libGLU1
- Avoid running configure twice

OBS-URL: https://build.opensuse.org/request/show/138907
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/glu?expand=0&rev=5

glu.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct 20 21:33:12 UTC 2012 - jengelh@inai.de
+
+- Add Obsoletes/Provides for Mesa-libGLU1
+- Avoid running configure twice
+
 -------------------------------------------------------------------
 Fri Sep 21 09:36:54 UTC 2012 - sndirsch@suse.com
 

glu.spec

@@ -45,6 +45,10 @@ world coordinates.
 %package -n %lname
 Summary:        OpenGL utility library
 Group:          System/Libraries
+# O/P since 12.3. This Obsoletes is special (since glu is in fact Mesa),
+# and should not be copy-pasted without review.
+Obsoletes:      Mesa-libGLU1 < %version-%release
+Provides:       Mesa-libGLU1 = %version-%release
 
 %description -n %lname
 GLU offers simple interfaces for building mipmaps; checking for the
@@ -62,6 +66,9 @@ with Mesa, but meanwhile developed separately.
 Summary:        Development files for the GLU API
 Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
+# O/P since 12.3
+Obsoletes:      Mesa-libGLU-devel < %version-%release
+Provides:       Mesa-libGLU-devel = %version-%release
 
 %description devel
 GLU offers simple interfaces for building mipmaps; checking for the
@@ -76,10 +83,12 @@ This package contains includes headers and static libraries for
 compiling programs with GLU.
 
 %prep
-%setup -q -n glu-%{version}
+%setup -q
 
 %build
-sh autogen.sh
+if [ ! -e configure ]; then
+	NOCONFIGURE=1 ./autogen.sh;
+fi;
 %configure --disable-static
 make %{?_smp_mflags}