From 7927d2ce9ea2442f3b84b9aeb61b9c81a5a7f717 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 21 Nov 2022 10:33:27 +0100
Subject: [PATCH] Update to 1.3.1

---
 mingw-dlfcn.spec | 63 ++++++++++++++++++++++++------------------------
 sources          |  2 +-
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/mingw-dlfcn.spec b/mingw-dlfcn.spec
index 21b2923..30d7182 100644
--- a/mingw-dlfcn.spec
+++ b/mingw-dlfcn.spec
@@ -1,19 +1,21 @@
-%?mingw_package_header
+%{?mingw_package_header}
 
 %global realname dlfcn-win32
 
 Name:          mingw-dlfcn
-Version:       1.2.0
-Release:       8%{?dist}
+Version:       1.3.1
+Release:       1%{?dist}
 Summary:       Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 
 License:       LGPLv2+
 URL:           https://github.com/%{realname}/%{realname}
-Source0:       https://github.com/%{realname}/%{realname}/archive/v%{version}.tar.gz
+Source0:       https://github.com/%{realname}/%{realname}/archive/v%{version}/%{realname}-%{version}.tar.gz
 
 BuildArch:     noarch
 
+BuildRequires: cmake
 BuildRequires: make
+
 BuildRequires: mingw32-filesystem >= 95
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
@@ -22,8 +24,6 @@ BuildRequires: mingw64-filesystem >= 95
 BuildRequires: mingw64-gcc
 BuildRequires: mingw64-binutils
 
-BuildRequires: cmake
-
 
 %description
 This library implements a wrapper for dlfcn, as specified in POSIX and SUS,
@@ -38,6 +38,7 @@ Summary:        Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 This library implements a wrapper for dlfcn, as specified in POSIX and SUS,
 around the dynamic link library functions found in the Windows API.
 
+
 %package -n mingw32-dlfcn-static
 Summary:        Static version of the MinGW Windows dlfcn library
 Requires:       mingw32-dlfcn = %{version}-%{release}
@@ -45,6 +46,7 @@ Requires:       mingw32-dlfcn = %{version}-%{release}
 %description -n mingw32-dlfcn-static
 Static version of the MinGW Windows dlfcn library.
 
+
 # Win64
 %package -n mingw64-dlfcn
 Summary:        Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
@@ -53,6 +55,7 @@ Summary:        Implements a wrapper for dlfcn (dlopen dlclose dlsym dlerror)
 This library implements a wrapper for dlfcn, as specified in POSIX and SUS,
 around the dynamic link library functions found in the Windows API.
 
+
 %package -n mingw64-dlfcn-static
 Summary:        Static version of the MinGW Windows dlfcn library
 Requires:       mingw64-dlfcn = %{version}-%{release}
@@ -61,11 +64,11 @@ Requires:       mingw64-dlfcn = %{version}-%{release}
 Static version of the MinGW Windows dlfcn library.
 
 
-%?mingw_debug_package
+%{?mingw_debug_package}
 
 
 %prep
-%setup -q -n %{realname}-%{version}
+%autosetup -p1 -n %{realname}-%{version}
 
 for f in README.md COPYING; do
     %{__sed} -i 's/\r//' "${f}";
@@ -73,37 +76,31 @@ done
 
 
 %build
+# Shared
+export MINGW_BUILDDIR_SUFFIX=-shared
 %mingw_cmake
+%mingw_make_build
 
-%mingw_make %{?_smp_mflags}
-
-# Build static win32 lib
-mkdir -p build_win32_static
-pushd build_win32_static
-%mingw32_cmake -DBUILD_SHARED_LIBS:BOOL=OFF
-popd
-# Build static win64 lib
-mkdir -p build_win64_static
-pushd build_win64_static
-%mingw64_cmake -DBUILD_SHARED_LIBS:BOOL=OFF
-popd
+# Static
+export MINGW_BUILDDIR_SUFFIX=-static
+%mingw_cmake -DBUILD_SHARED_LIBS:BOOL=OFF
+%mingw_make_build
 
 
 %install
-%mingw_make DESTDIR=$RPM_BUILD_ROOT install
-# Install static win32 lib
-pushd build_win32_static
-%mingw32_make DESTDIR=$RPM_BUILD_ROOT install
-popd
-# Install static win64 lib
-pushd build_win64_static
-%mingw64_make DESTDIR=$RPM_BUILD_ROOT install
-popd
+# Shared
+export MINGW_BUILDDIR_SUFFIX=-shared
+%mingw_make_install
+
+# Static
+export MINGW_BUILDDIR_SUFFIX=-static
+%mingw_make_install
 
 
 # Win32
 %files -n mingw32-dlfcn
-%doc README.md COPYING
+%doc README.md
+%license COPYING
 %{mingw32_bindir}/libdl.dll
 %{mingw32_libdir}/libdl.dll.a
 %{mingw32_includedir}/dlfcn.h
@@ -114,7 +111,8 @@ popd
 
 # Win64
 %files -n mingw64-dlfcn
-%doc README.md COPYING
+%doc README.md
+%license COPYING
 %{mingw64_bindir}/libdl.dll
 %{mingw64_libdir}/libdl.dll.a
 %{mingw64_includedir}/dlfcn.h
@@ -125,6 +123,9 @@ popd
 
 
 %changelog
+* Mon Nov 21 2022 Sandro Mani <manisandro@gmail.com> - 1.3.1-1
+- Update to 1.3.1
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 1ffea80..773db24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.2.0.tar.gz) = bf38d1de009fbf78edb50613252f667e122305e52e9962161af98866d48d4fdf8897dd4232495895606b69593ecc306e35a7766ee9286e59726c8ccb380b4cbf
+SHA512 (dlfcn-win32-1.3.1.tar.gz) = 0aa01c49ee8628c42cdc8b9782b4741a36502764d4442227ea4e9a8062356ff17e8eaa3cdd4113009ad7ad2044b6cfd24128319d71825e13062259dd1906e27e