diff --git a/96.patch b/96.patch deleted file mode 100644 index e8e358e..0000000 --- a/96.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c17d66e5dce011acef34435598eddf7122458b33 Mon Sep 17 00:00:00 2001 -From: Jean-Francois Dockes -Date: Thu, 13 Dec 2018 18:39:43 +0100 -Subject: [PATCH] Ensure that the samples use the same largefile options as the - library - -Create a configuration file specific to the samples, to mimick what a -regular application would have to do. ---- - .gitignore | 2 ++ - configure.ac | 2 +- - upnp/sample/common/config_sample.h.in | 21 +++++++++++++++++++++ - upnp/sample/common/sample_util.h | 1 + - 4 files changed, 25 insertions(+), 1 deletion(-) - create mode 100644 upnp/sample/common/config_sample.h.in - -diff --git a/configure.ac b/configure.ac -index 108ad7bf..670d3632 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -432,7 +432,7 @@ AC_CANONICAL_HOST - # libraries : it contains information on the configuration of the - # installed libraries. - # --AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) -+AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h upnp/sample/common/config_sample.h]) - AX_SYS_LARGEFILE_SENSITIVE - - if test "x$ac_cv_sys_largefile_sensitive" = "xyes"; then -diff --git a/upnp/sample/common/config_sample.h.in b/upnp/sample/common/config_sample.h.in -new file mode 100644 -index 00000000..8fbc38e3 ---- /dev/null -+++ b/upnp/sample/common/config_sample.h.in -@@ -0,0 +1,21 @@ -+/* -+ * On systems where the size of off_t depends on compile flags, libupnp needs -+ * the programs which use it to be built with the same options as itself. -+ * This is checked at compile time, but the actual variables (such as -+ * _FILE_OFFSET_BITS) are not exported by the library (to avoid surprises in -+ * applications). -+ * A "normal" application would need to explicitely configure large file -+ * support depending on how libupnp was built, using its own configure -+ * routines. For the samples, we equivalently let the main libupnp configure -+ * create this file. -+ */ -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -diff --git a/upnp/sample/common/sample_util.h b/upnp/sample/common/sample_util.h -index 2bca04ff..6d853efb 100644 ---- a/upnp/sample/common/sample_util.h -+++ b/upnp/sample/common/sample_util.h -@@ -44,6 +44,7 @@ - extern "C" { - #endif /* __cplusplus */ - -+#include "config_sample.h" - #include "ithread.h" - #include "ixml.h" /* for IXML_Document, IXML_Element */ - #include "upnp.h" /* for Upnp_EventType */ diff --git a/libupnp.spec b/libupnp.spec index 025f8b6..2865fc1 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -1,11 +1,11 @@ -Version: 1.8.3 +Version: 1.8.4 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD URL: https://sourceforge.net/projects/pupnp Source: https://downloads.sourceforge.net/pupnp/%{name}-%{version}.tar.bz2 -Patch0: 96.patch +Patch0: libupnp-1.8.4-nobump.patch BuildRequires: gcc autoconf automake @@ -47,7 +47,7 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %ldconfig_scriptlets %files -%license LICENSE +%license COPYING %doc THANKS %{_libdir}/libixml.so.10* %{_libdir}/libupnp.so.10* @@ -59,6 +59,10 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %{_libdir}/pkgconfig/libupnp.pc %changelog +* Tue Jan 08 2019 Nicolas Chauvet - 1.8.4-1 +- Update to 1.8.4 +- Revert the ABI bump since it's the same as 1.8.3 + * Thu Dec 13 2018 Dennis Gilmore - 1.8.3-4 - pull in patch from upstream so that samples will build on 32 bit arches with - largefile support, enables gerbera to run on armv7hl and i686 diff --git a/sources b/sources index a2d118b..b545e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libupnp-1.8.3.tar.bz2) = fa41efa11ad784e9c0040cecb17e91fbb4106509a9c84c6838b5bb636bfc96710683417fba6f4f4aec3f068fccbfe4f3a8218eca80bbca9e5604865ec72e5d66 +SHA512 (libupnp-1.8.4.tar.bz2) = 403d7b6408a33330fc59fbe6284cc7bca10a675c41b323bba6b9c6461c8a82fbb39f4a1a07d1a3b55f049c637830ebf21bd825cd6c2f4eb17265018ccee9cbb6