From 77d60b580792931949e94c7b5348703798464b1759f5d81107bb02f02830eb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 25 Feb 2017 12:35:24 +0000 Subject: [PATCH] Accepting request 460296 from home:olh:branches:devel:libraries:c_c++ - Update to version 1.6.21 see included ChangeLog for details - Replace individual packages from Packman to make migration to Tumbleweed easier. - Package LICENSE file OBS-URL: https://build.opensuse.org/request/show/460296 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libupnp?expand=0&rev=15 --- libupnp-1.6.19.tar.bz2 | 3 - libupnp-1.6.19.tar.bz2.sha1 | 1 - libupnp-1.6.21.tar.bz2 | 3 + libupnp-1.6.21.tar.bz2.sha1 | 1 + libupnp-configure.patch | 110 ++---------------------------------- libupnp.changes | 9 +++ libupnp.spec | 12 +++- 7 files changed, 28 insertions(+), 111 deletions(-) delete mode 100644 libupnp-1.6.19.tar.bz2 delete mode 100644 libupnp-1.6.19.tar.bz2.sha1 create mode 100644 libupnp-1.6.21.tar.bz2 create mode 100644 libupnp-1.6.21.tar.bz2.sha1 diff --git a/libupnp-1.6.19.tar.bz2 b/libupnp-1.6.19.tar.bz2 deleted file mode 100644 index 24d8e00..0000000 --- a/libupnp-1.6.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a -size 1213439 diff --git a/libupnp-1.6.19.tar.bz2.sha1 b/libupnp-1.6.19.tar.bz2.sha1 deleted file mode 100644 index f43e8eb..0000000 --- a/libupnp-1.6.19.tar.bz2.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee9e16ff42808521b62b7fc664fc9cba479ede88 libupnp-1.6.19.tar.bz2 diff --git a/libupnp-1.6.21.tar.bz2 b/libupnp-1.6.21.tar.bz2 new file mode 100644 index 0000000..6b7ecbd --- /dev/null +++ b/libupnp-1.6.21.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b +size 1245353 diff --git a/libupnp-1.6.21.tar.bz2.sha1 b/libupnp-1.6.21.tar.bz2.sha1 new file mode 100644 index 0000000..30cbbda --- /dev/null +++ b/libupnp-1.6.21.tar.bz2.sha1 @@ -0,0 +1 @@ +4c2f03f8d2f52d92bfe80039a027fafa98c8c226 libupnp-1.6.21.tar.bz2 diff --git a/libupnp-configure.patch b/libupnp-configure.patch index aae4ed6..228783e 100644 --- a/libupnp-configure.patch +++ b/libupnp-configure.patch @@ -1,26 +1,15 @@ ---- configure.ac 2013-01-29 16:39:56.000000000 +0100 -+++ configure.ac 2013-02-17 10:40:53.680021913 +0100 -@@ -7,9 +7,9 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -7,7 +7,7 @@ # (C) Copyright 2005-2007 Rémi Turboult # -AC_PREREQ(2.60) +AC_PREREQ([2.60]) --AC_INIT([libupnp], [1.6.19], [mroberto@users.sourceforge.net]) -+AC_INIT([libupnp],[1.6.19],[mroberto@users.sourceforge.net]) + AC_INIT([libupnp], [1.6.21], [mroberto@users.sourceforge.net]) dnl ############################################################################ - dnl # *Independently* of the above libupnp package version, the libtool version - dnl # of the 3 libraries need to be updated whenever there is a change released: -@@ -366,7 +366,6 @@ - # installed libraries. - # - AC_CONFIG_HEADERS([autoconfig.h upnp/inc/upnpconfig.h]) --#AC_SYS_LARGEFILE_SENSITIVE - - AC_REVISION([$Revision: 1.11 $]) - -@@ -519,10 +519,13 @@ +@@ -549,10 +549,12 @@ AC_MSG_RESULT($docdir) # # Checks for programs # @@ -31,103 +20,16 @@ AM_PROG_CC_C_O m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -AC_PROG_LIBTOOL -+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +LT_INIT AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_EGREP -@@ -532,9 +534,7 @@ - #: - # Use -O0 in debug so that variables do not get optimized out - AX_CFLAGS_GCC_OPTION([-O0, -g]) -- else -- # add optimise for size -- AX_CFLAGS_GCC_OPTION([-Os]) -+ - fi - ;; - esac -@@ -548,8 +548,7 @@ +@@ -592,8 +594,6 @@ echo "---------------------------------- # AC_TYPE_SIZE_T AC_TYPE_OFF_T -AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support]) -AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size]) -+ # ---- ixml/Makefile.am.orig -+++ ixml/Makefile.am -@@ -7,7 +7,7 @@ - - SUBDIRS = doc - --AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc -+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc - AM_CFLAGS = - - LDADD = libixml.la ---- threadutil/Makefile.am.orig -+++ threadutil/Makefile.am -@@ -4,7 +4,7 @@ - # (C) Copyright 2005 Remi Turboult - # - --AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc -+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h -I$(srcdir)/inc -I$(srcdir)/src/inc - - if ENABLE_DEBUG - AM_CPPFLAGS += -DDEBUG -DSTATS ---- upnp/src/api/UpnpString.c.orig -+++ upnp/src/api/UpnpString.c -@@ -28,38 +28,6 @@ - /* Other systems have strncasecmp */ - #endif - --#ifndef UPNP_USE_MSVCPP -- /* VC has strnlen which is already included but with (potentially) different linkage */ -- /* strnlen() is a GNU extension. */ -- #if HAVE_STRNLEN -- extern size_t strnlen(const char *s, size_t maxlen); -- #else /* HAVE_STRNLEN */ -- static size_t strnlen(const char *s, size_t n) -- { -- const char *p = (const char *)memchr(s, 0, n); -- return p ? p - s : n; -- } -- #endif /* HAVE_STRNLEN */ --#endif /* WIN32 */ -- --/* strndup() is a GNU extension. */ --#if HAVE_STRNDUP && !defined(WIN32) -- extern char *strndup(__const char *__string, size_t __n); --#else /* HAVE_STRNDUP && !defined(WIN32) */ -- static char *strndup(const char *__string, size_t __n) -- { -- size_t strsize = strnlen(__string, __n); -- char *newstr = (char *)malloc(strsize + 1); -- if (newstr == NULL) -- return NULL; -- -- strncpy(newstr, __string, strsize); -- newstr[strsize] = 0; -- -- return newstr; -- } --#endif /* HAVE_STRNDUP && !defined(WIN32) */ -- - /*! - * \brief Internal implementation of the class UpnpString. - * ---- upnp/Makefile.am.orig -+++ upnp/Makefile.am -@@ -6,7 +6,7 @@ - - SUBDIRS = doc . sample - --AM_CPPFLAGS = \ -+AM_CPPFLAGS = -include $(top_builddir)/autoconfig.h \ - -I$(srcdir)/inc \ - -I$(top_srcdir)/threadutil/inc \ - -I$(top_srcdir)/ixml/inc diff --git a/libupnp.changes b/libupnp.changes index 2f0922f..4a2d05d 100644 --- a/libupnp.changes +++ b/libupnp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 24 19:26:45 UTC 2017 - olaf@aepfle.de + +- Update to version 1.6.21 + see included ChangeLog for details +- Replace individual packages from Packman to make migration to + Tumbleweed easier. +- Package LICENSE file + ------------------------------------------------------------------- Thu Feb 19 20:29:34 UTC 2015 - p.drouand@gmail.com diff --git a/libupnp.spec b/libupnp.spec index ca01f62..5cfd8be 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -20,7 +20,7 @@ %define lname libupnp6 Name: libupnp -Version: 1.6.19 +Version: 1.6.21 Release: 0 Summary: Portable Universal Plug and Play (UPnP) SDK License: BSD-3-Clause @@ -42,6 +42,11 @@ systems. %package -n %lname Summary: Portable Universal Plug and Play (UPnP) SDK Group: System/Libraries +# Replace individual packages from Packman to make migration to Tumbleweed easier. +Provides: libixml2 = %{version}-%{release} +Obsoletes: libixml2 < %{version} +Provides: libthreadutil6 = %{version}-%{release} +Obsoletes: libthreadutil6 < %{version} %description -n %lname The portable Universal Plug and Play (UPnP) SDK provides support for building @@ -60,7 +65,8 @@ systems. %prep %setup -q -%patch +%patch -p1 + %build autoreconf -fiv %configure --disable-samples --enable-ipv6 --disable-static @@ -76,7 +82,7 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' %files -n %lname %defattr(-,root,root,-) -%doc ChangeLog NEWS README TODO +%doc ChangeLog NEWS README TODO LICENSE %{_libdir}/libixml.so.* %{_libdir}/libthreadutil.so.* %{_libdir}/libupnp.so.*