From 86ad9562aa6539355ce79626023ba598ea01a074aa5726a9b62e7a174af8933c Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 6 May 2017 15:12:44 +0000
Subject: [PATCH] Accepting request 493103 from home:jengelh:branches:X11:XOrg

resolve the "%_lib" = "%_lib" fuckup from previous SR

OBS-URL: https://build.opensuse.org/request/show/493103
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=8
---
 baselibs.conf    |  2 +-
 libglvnd.changes |  9 +++++++++
 libglvnd.spec    | 32 +++++++++-----------------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 1b6673d..c0a8c61 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-libglvnd0
+libglvnd
 libglvnd-devel
diff --git a/libglvnd.changes b/libglvnd.changes
index 77a9184..f35c348 100644
--- a/libglvnd.changes
+++ b/libglvnd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Apr 29 20:59:17 UTC 2017 - jengelh@inai.de
+
+- The package misuses an SLPP package name (libglvnd0) while not
+  being SLPP — there is not even a libglvnd.so.0. Since
+  implementing SLPP does not make much sense either (these are all
+  just compat wrappers), switch to libglvnd.
+- Avoid doubleshipping of README.
+
 -------------------------------------------------------------------
 Fri Apr  7 11:09:23 UTC 2017 - jengelh@inai.de
 
diff --git a/libglvnd.spec b/libglvnd.spec
index 109e5e8..9945c0e 100644
--- a/libglvnd.spec
+++ b/libglvnd.spec
@@ -17,7 +17,6 @@
 
 
 Name:           libglvnd
-%define sonum	0
 Version:        0.1.1~20161222~dc16f8c
 Release:        0
 Summary:        The GL Vendor-Neutral Dispatch library
@@ -37,26 +36,18 @@ BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       libglvnd0 = %version-%release
+Obsoletes:      libglvnd0 < %version-%release
 
 %description
 Vendor-neutral dispatch layer for arbitrating OpenGL API calls between
 multiple vendors on a per-screen basis, as described by Andy Ritger's
 OpenGL ABI proposal.
  
-%package -n %name%sonum
-Summary:        The GL Vendor-Neutral Dispatch library
-Group:          System/Libraries
-Recommends:     Mesa-libGL1 >= 12.0.0
-
-%description -n %name%sonum
-Vendor-neutral dispatch layer for arbitrating OpenGL API calls between
-multiple vendors on a per-screen basis, as described by Andy Ritger's
-OpenGL ABI proposal.
-
 %package devel
 Summary:        Development files for libglvnd
 Group:          Development/Libraries/C and C++
-Requires:       %name%sonum = %version
+Requires:       %name = %version
 Recommends:     Mesa-libGL-devel >= 12.0.0
 
 %description devel
@@ -79,14 +70,13 @@ development.
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%buildroot";
+%make_install
+find "%buildroot" -type f -name "*.la" -delete
 >%_builddir/%name-%version/filelist.rpm
 %if 0%{?suse_version} < 1330
-rm -f "%buildroot/usr/X11R6/%_lib"/*.la
 mkdir -p %buildroot/%_libdir/pkgconfig
 mv %buildroot/usr/X11R6/%_lib/pkgconfig/*.pc %buildroot/%_libdir/pkgconfig
-rm -rf %buildroot/usr/X11R6/pkgconfig
-if [ "%_libdir" == "/usr/lib64" ]; then
+if [ "%_lib" == "lib64" ]; then
   mkdir -p %buildroot/%_sysconfdir/ld.so.conf.d
   cat > %buildroot/%_sysconfdir/ld.so.conf.d/%name.conf << EOF
 /usr/X11R6/%_lib
@@ -94,15 +84,12 @@ if [ "%_libdir" == "/usr/lib64" ]; then
 EOF
   echo "%config %_sysconfdir/ld.so.conf.d/%name.conf" >%_builddir/%name-%version/filelist.rpm
 fi
-%else
-rm -f "%buildroot/%_libdir"/*.la
 %endif
 
-%post   -n %name%sonum -p /sbin/ldconfig
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%postun -n %name%sonum -p /sbin/ldconfig
-
-%files -n %name%sonum -f filelist.rpm
+%files -f filelist.rpm
 %defattr(-,root,root)
 %doc README.md
 %if 0%{?suse_version} < 1330
@@ -115,7 +102,6 @@ rm -f "%buildroot/%_libdir"/*.la
 
 %files devel
 %defattr(-,root,root)
-%doc README.md
 %if 0%{?suse_version} < 1330
 %dir /usr/X11R6
 %dir /usr/X11R6/%_lib