diff --git a/miniupnpc-1.6.tar.gz b/miniupnpc-1.6.tar.gz deleted file mode 100644 index cd1b4c5..0000000 --- a/miniupnpc-1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6451b7d6f184d0ae0c813994 -size 66454 diff --git a/miniupnpc-1.7.tar.gz b/miniupnpc-1.7.tar.gz new file mode 100644 index 0000000..9f1fdfb --- /dev/null +++ b/miniupnpc-1.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16dd2456be9b4bf290667c00eeb38c77ad47eb2107569b2dadcfcee8c9af6337 +size 68327 diff --git a/miniupnpc-makefile.patch b/miniupnpc-makefile.patch deleted file mode 100644 index 0210ebd..0000000 --- a/miniupnpc-makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig 2011-06-21 17:24:14.000000000 +0200 -+++ Makefile 2011-12-23 17:54:49.000000000 +0100 -@@ -12,7 +12,9 @@ - CC ?= gcc - #AR = gar - #CFLAGS = -O -Wall -g -DDEBUG --CFLAGS ?= -O -Wall -DNDEBUG -DMINIUPNPC_SET_SOCKET_TIMEOUT -Wstrict-prototypes -+OPTFLAGS = -O -+CFLAGS ?= -O -Wall -DNDEBUG -DMINIUPNPC_SET_SOCKET_TIMEOUT -Wstrict-prototypes $(OPTFLAGS) -+PYTHON = python - # -DNO_GETADDRINFO - INSTALL = install - SH = /bin/sh -@@ -103,7 +105,7 @@ - everything: all $(EXECUTABLES_ADDTESTS) - - pythonmodule: $(LIBRARY) miniupnpcmodule.c setup.py -- python setup.py build -+ $(PYTHON) setup.py build - touch $@ - - installpythonmodule: pythonmodule diff --git a/miniupnpc.changes b/miniupnpc.changes index 8480a79..d89b991 100644 --- a/miniupnpc.changes +++ b/miniupnpc.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Dec 24 22:29:47 UTC 2012 - p.drouand@gmail.com + +- Update to 1.7 version: + * Cleanup settings of CFLAGS in Makefile + * Fix signed/unsigned integer comparaisons + * Allow to specify protocol with TCP or UDP for -A option + * Only try to fetch XML description once in UPNP_GetValidIGD() + * Added -ansi flag to compilation, and fixed C++ comments to ANSI C comments. + * minor improvements to minihttptestserver.c + * upnperrors.c returns valid error string for unrecognized error codes + * make minihttptestserver listen on loopback interface instead of 0.0.0.0 + * Maven installation thanks to Alexey Kuznetsov + * Replace WIN32 macro by _WIN32 + * Fixes in java wrappers thanks to Alexey Kuznetsov : + https://github.com/axet/miniupnp/tree/fix-javatest/miniupnpc + * Make and install .deb packages (python) thanks to Alexey Kuznetsov : + https://github.com/axet/miniupnp/tree/feature-debbuild/miniupnpc + * The multicast interface can now be specified by name with IPv4. + * Install man page + * added header to Port Mappings list in upnpc.c + * Makefile : make clean now removes jnaerator generated files. + * MINIUPNPC_VERSION in miniupnpc.h (updated by make) + * added rootdescURL to UPNPUrls structure. +- Remove unneeded miniupnpc-makefile.patch + ------------------------------------------------------------------- Fri Feb 17 09:03:59 UTC 2012 - vuntz@opensuse.org diff --git a/miniupnpc.spec b/miniupnpc.spec index 368b10a..aaab861 100644 --- a/miniupnpc.spec +++ b/miniupnpc.spec @@ -16,20 +16,17 @@ # -Name: miniupnpc -Version: 1.6 -Release: 0.0 %define soname 8 + +Name: miniupnpc +Version: 1.7 +Release: 0 Summary: Universal Plug'n'Play (UPnP) Client License: BSD-3-Clause Group: Productivity/Networking/Other Source: http://miniupnp.free.fr/files/miniupnpc-%{version}.tar.gz -Patch1: miniupnpc-makefile.patch Url: http://miniupnp.free.fr/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc -BuildRequires: glibc-devel -BuildRequires: make BuildRequires: python-devel Requires: libminiupnpc%{soname} = %{version}-%{release} @@ -67,7 +64,6 @@ Device (IGD) specifications. %prep %setup -q -%patch1 %build make %{?_smp_mflags} \ @@ -90,6 +86,8 @@ make %{?_smp_mflags} \ --prefix="%{_prefix}" \ --root="%{buildroot}" \ --record-rpm="rpmfiles.lst" +# Remove static libs +rm -f %{buildroot}%{_libdir}/*.a %post -n libminiupnpc%{soname} -p /sbin/ldconfig @@ -99,6 +97,7 @@ make %{?_smp_mflags} \ %defattr(-,root,root) %{_bindir}/upnpc %{_bindir}/external-ip +%{_mandir}/man3/miniupnpc.3.gz %files -n libminiupnpc%{soname} %defattr(-,root,root) @@ -108,7 +107,6 @@ make %{?_smp_mflags} \ %files -n libminiupnpc-devel %defattr(-,root,root) %{_includedir}/miniupnpc/ -%{_libdir}/libminiupnpc.a %{_libdir}/libminiupnpc.so %files -n python-miniupnpc -f rpmfiles.lst