- updated to 1.14.12

- removed obsolete ithread patch

diff --git a/ithread.patch b/ithread.patch
deleted file mode 100644 (file)
index 04d6ac6..0000000
--- a/ithread.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c0b552973c5db6dbe4dd0bdc47496da3d7af9606 Mon Sep 17 00:00:00 2001
-From: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>
-Date: Sun, 1 Aug 2021 20:44:13 -0300
-Subject: [PATCH] ithread: Remove references to
- pthread_mutexattr_{g,s}etkind_np
-
----
- upnp/inc/ithread.h | 33 ++++++++++++++-------------------
- 1 file changed, 14 insertions(+), 19 deletions(-)
-
-diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h
-index f6800ea9..2087466b 100644
---- a/upnp/inc/ithread.h
-+++ b/upnp/inc/ithread.h
-@@ -304,11 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
-  *      Returns EINVAL if the kind is not supported.
-  *      See man page for pthread_mutexattr_setkind_np
-  *****************************************************************************/
--#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
--      #define ithread_mutexattr_setkind_np pthread_mutexattr_settype
--#else
--      #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
--#endif /* UPNP_USE_RWLOCK */
-+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
-+#define ithread_mutexattr_settype pthread_mutexattr_settype
- 
- /****************************************************************************
-  * Function: ithread_mutexattr_getkind_np
-@@ -329,11 +326,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
-  *      Always returns 0.
-  *      See man page for pthread_mutexattr_getkind_np
-  *****************************************************************************/
--#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
--      #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
--#else
--      #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
--#endif /* UPNP_USE_RWLOCK */
-+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
-+#define ithread_mutexattr_gettype pthread_mutexattr_gettype
- 
- /****************************************************************************
-  * Function: ithread_mutex_init
-@@ -898,15 +892,16 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
- #ifdef _WIN32
-       #define imillisleep Sleep
- #else
--#if _POSIX_C_SOURCE < 200809L
--      #define imillisleep(x) usleep(1000 * x)
--#else
--      #define imillisleep(x) \
--              do { \
--                      const struct timespec req = {0, x * 1000 * 1000}; \
--                      nanosleep(&req, NULL); \
--              } while(0)
--#endif
-+      #if _POSIX_C_SOURCE < 200809L
-+              #define imillisleep(x) usleep(1000 * x)
-+      #else
-+              #define imillisleep(x) \
-+                      do { \
-+                              const struct timespec req = { \
-+                                      0, x * 1000 * 1000}; \
-+                              nanosleep(&req, NULL); \
-+                      } while (0)
-+      #endif
- #endif
- 
- #if !defined(PTHREAD_MUTEX_RECURSIVE) && !defined(__DragonFly__) && \

diff --git a/libupnp.spec b/libupnp.spec
index 47dd0b724d9372386ffd1d20cb902e2aae06344b..7adffc82165ec2282dc7f86ab5ec491e5ac41ed5 100644 (file)
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -1,15 +1,14 @@
 Summary:       The Universal Plug and Play (UPnP) SDK for Linux
 Summary(pl.UTF-8):     Pakiet programistyczny Universal Plug and Play (UPnP) dla Linuksa
 Name:          libupnp
-Version:       1.14.6
-Release:       2
+Version:       1.14.12
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2
-# Source0-md5: 05c2393eee4fbf81c9e1b116b9554039
+# Source0-md5: 63a51264054f62947f930c2f89e49b28
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-openssl.patch
-Patch2:                ithread.patch
 URL:           http://pupnp.sourceforge.net/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.8
@@ -17,6 +16,7 @@ BuildRequires:        doxygen
 BuildRequires: libtool >= 2:1.5
 BuildRequires: openssl-devel >= 0.9.8b
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -77,7 +77,6 @@ Dokumentacja API bibliotek upnp.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # LFS is required in library clients (including examples)
 %{__sed} -i -e '/^Cflags/ s/$/ -D_FILE_OFFSET_BITS=64/' libupnp.pc.in