From ea6b8c7ee4a37a46fc3be5f06d2c5cca9425af9bfc4445b76e4465f5a6ea470c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 14 Jul 2014 10:50:03 +0000
Subject: [PATCH] Use shlib packaging guidelines

OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win32/mingw32-winpthreads?expand=0&rev=9
---
 mingw32-winpthreads.changes |  5 ++++
 mingw32-winpthreads.spec    | 49 ++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/mingw32-winpthreads.changes b/mingw32-winpthreads.changes
index 1b73663..c793f21 100644
--- a/mingw32-winpthreads.changes
+++ b/mingw32-winpthreads.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 14 10:47:35 UTC 2014 - jengelh@inai.de
+
+- Implement shlib package naming guidelines
+
 -------------------------------------------------------------------
 Thu Jun 19 12:24:42 UTC 2014 - jw@owncloud.com
 
diff --git a/mingw32-winpthreads.spec b/mingw32-winpthreads.spec
index 31a7e9e..b743dc1 100644
--- a/mingw32-winpthreads.spec
+++ b/mingw32-winpthreads.spec
@@ -16,40 +16,49 @@
 #
 
 
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+%define __strip %_mingw32_strip
+%define __objdump %_mingw32_objdump
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
-%define __os_install_post %{_mingw32_debug_install_post} \
-                          %{_mingw32_install_post}
+%define __find_requires %_mingw32_findrequires
+%define __find_provides %_mingw32_findprovides
+%define __os_install_post %_mingw32_debug_install_post \
+                          %_mingw32_install_post
+
 Name:           mingw32-winpthreads
 Version:        3.1.0
 Release:        0
 Summary:        A pthreads implementation for Windows
 License:        MIT and BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Url:            http://mingw-w64.sf.net/
-Source:         mingw-w64-winpthreads-%{version}.tar.xz
+URL:            http://mingw-w64.sf.net/
+
+Source:         mingw-w64-winpthreads-%version.tar.xz
 BuildRequires:  mingw32-cross-gcc-bootstrap
 BuildRequires:  mingw32-cross-pkg-config
 BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-runtime
 BuildRequires:  xz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 BuildArch:      noarch
 #!BuildIgnore:  post-build-checks
 
 %description
 mingw-w64's implementation of POSIX threads for Windows.
 
+%package -n mingw32-libwinpthread1
+Summary:        A pthreads implementation for Windows
+Group:          System/Libraries
+Obsoletes:      mingw32-winpthreads
+
+%description -n mingw32-libwinpthread1
+mingw-w64's implementation of POSIX threads for Windows.
+
 %package devel
 Summary:        Development files for mingw32-winpthreads
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %name = %version
 Provides:       mingw32-unistd-pthread-devel
-Conflicts:      mingw32-headers-dummy-pthread otherproviders(mingw32-unistd-pthread-devel)
+Conflicts:      mingw32-headers-dummy-pthread, otherproviders(mingw32-unistd-pthread-devel)
 
 %description devel
 mingw-w64's implementation of POSIX threads for Windows.
@@ -65,24 +74,24 @@ mingw-w64's implementation of POSIX threads for Windows.
 mkdir fakelib
 pushd fakelib
 touch empty.c
-%{_mingw32_cc} -c empty.c
-%{_mingw32_ar} rsc libpthread.a empty.o
+%_mingw32_cc -c empty.c
+%_mingw32_ar rsc libpthread.a empty.o
 popd
-%{_mingw32_configure} \
+%_mingw32_configure \
 	--disable-static \
 	--enable-shared
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make DESTDIR=%buildroot install %{?_smp_mflags}
 
-%files
+%files -n mingw32-libwinpthread1
 %defattr(-,root,root)
-%{_mingw32_bindir}/*.dll
+%_mingw32_bindir/libwinpthread-1.dll
 
 %files devel
 %defattr(-,root,root)
-%{_mingw32_includedir}/
-%{_mingw32_libdir}/
+%_mingw32_includedir/
+%_mingw32_libdir/
 
 %changelog