From 00af0adc7a7a0f3a1d15f99201082e58f62dcc43 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Fri, 18 Sep 2015 15:32:21 +0800
Subject: [PATCH] Update to 20150609

---
 .gitignore                                   |  1 +
 libnatpmp-precluding-cflags-overriding.patch | 18 ---------------
 libnatpmp.spec                               | 24 ++++++++++++--------
 sources                                      |  2 +-
 4 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 libnatpmp-precluding-cflags-overriding.patch

diff --git a/.gitignore b/.gitignore
index fc6923f..23f131e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libnatpmp-20131126.tar.gz
 /libnatpmp-20140401.tar.gz
+/libnatpmp-20150609.tar.gz
diff --git a/libnatpmp-precluding-cflags-overriding.patch b/libnatpmp-precluding-cflags-overriding.patch
deleted file mode 100644
index 28f0514..0000000
--- a/libnatpmp-precluding-cflags-overriding.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: libnatpmp-20140401/Makefile
-===================================================================
---- libnatpmp-20140401.orig/Makefile
-+++ libnatpmp-20140401/Makefile
-@@ -25,10 +25,10 @@ APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
- CFLAGS ?= -Os
- #CFLAGS = -g -O0
--CFLAGS += -fPIC
--CFLAGS += -Wall
-+override CFLAGS += -fPIC
-+override CFLAGS += -Wall
- #CFLAGS += -Wextra
--CFLAGS += -DENABLE_STRNATPMPERR
-+override CFLAGS += -DENABLE_STRNATPMPERR
- #CFLAGS += -Wstrict-aliasing
- 
- LIBOBJS = natpmp.o getgateway.o
diff --git a/libnatpmp.spec b/libnatpmp.spec
index bd9c88e..f3ae21d 100644
--- a/libnatpmp.spec
+++ b/libnatpmp.spec
@@ -1,16 +1,15 @@
 Name:           libnatpmp
-Version:        20140401
-Release:        3%{?dist}
+Version:        20150609
+Release:        1%{?dist}
 Summary:        Library of The NAT Port Mapping Protocol (NAT-PMP)
 License:        LGPLv2+
 URL:            http://miniupnp.free.fr/libnatpmp.html
 Source0:        http://miniupnp.free.fr/files/%{name}-%{version}.tar.gz
-Patch0:         libnatpmp-precluding-cflags-overriding.patch
 
 %description
-libnatpmp is an attempt to make a portable and fully compliant implementation 
-of the protocol for the client side. It is based on non blocking sockets and 
-all calls of the API are asynchronous. It is therefore very easy to integrate 
+libnatpmp is an attempt to make a portable and fully compliant implementation
+of the protocol for the client side. It is based on non blocking sockets and
+all calls of the API are asynchronous. It is therefore very easy to integrate
 the NAT-PMP code to any event driven code.
 
 %package        devel
@@ -23,30 +22,37 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-make CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags}
+%make_build CFLAGS="-fPIC -Wall -DENABLE_STRNATPMPERR %{optflags}" EXTRA_LD="%{?__global_ldflags}"
 
 %install
 make install INSTALL="install -p" PREFIX=%{buildroot} INSTALLDIRLIB="%{buildroot}%{_libdir}"
 find %{buildroot} -name '*.a' -delete -print
 find %{buildroot} -name '*.so' -exec chmod 755 {} ";" -print
 
+%check
+make testgetgateway
+./testgetgateway
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc Changelog.txt LICENSE README
+%license LICENSE
 %{_bindir}/natpmpc
 %{_libdir}/*.so.*
 
 %files devel
+%doc Changelog.txt README
 %{_libdir}/*.so
 %{_includedir}/natpmp.h
 
 %changelog
+* Sat Aug 22 2015 Christopher Meng <rpm@cicku.me> - 20150609-1
+- Update to 20150609
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20140401-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 90c6925..b309cbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c9a7c76e200ead4e6447fe4b105f676  libnatpmp-20140401.tar.gz
+7bd1af6710271e1743df5422be350bd8  libnatpmp-20150609.tar.gz