From 4f9141d4993f5092eac5a668c5390070fe805e7d Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 9 Jun 2014 17:15:39 +0800 Subject: [PATCH] Update to 20140401 Makefile overriding patch refreshed --- .gitignore | 1 + libnatpmp-precluding-cflags-overriding.patch | 20 ++++++++++---------- libnatpmp.spec | 9 ++++++--- sources | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 7a87a48..fc6923f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libnatpmp-20131126.tar.gz +/libnatpmp-20140401.tar.gz diff --git a/libnatpmp-precluding-cflags-overriding.patch b/libnatpmp-precluding-cflags-overriding.patch index fc02ce1..28f0514 100644 --- a/libnatpmp-precluding-cflags-overriding.patch +++ b/libnatpmp-precluding-cflags-overriding.patch @@ -1,18 +1,18 @@ ---- libnatpmp-20131126/Makefile.orig 2014-02-14 15:11:03.817984512 +0800 -+++ libnatpmp-20131126/Makefile 2014-02-14 15:11:14.132018382 +0800 -@@ -23,12 +23,9 @@ - APIVERSION = 1 +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 ?= -Os + #CFLAGS = -g -O0 -CFLAGS += -fPIC -CFLAGS += -Wall --#CFLAGS += -Wextra --CFLAGS += -DENABLE_STRNATPMPERR --#CFLAGS += -Wstrict-aliasing +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 cf1375c..2f35856 100644 --- a/libnatpmp.spec +++ b/libnatpmp.spec @@ -1,6 +1,6 @@ Name: libnatpmp -Version: 20131126 -Release: 3%{?dist} +Version: 20140401 +Release: 1%{?dist} Summary: Library of The NAT Port Mapping Protocol (NAT-PMP) License: LGPLv2+ URL: http://miniupnp.free.fr/libnatpmp.html @@ -26,7 +26,7 @@ developing applications that use %{name}. %patch0 -p1 %build -make CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" %{?_smp_mflags} +make CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags} %install make install INSTALL="install -p" PREFIX=%{buildroot} INSTALLDIRLIB="%{buildroot}%{_libdir}" @@ -47,6 +47,9 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ";" -print %{_includedir}/natpmp.h %changelog +* Sun Jun 01 2014 Christopher Meng - 20140401-1 +- Update to 20140401 + * Sat Jun 07 2014 Fedora Release Engineering - 20131126-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 26499a8..90c6925 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -211921e35fb3f21f525518d265f3d554 libnatpmp-20131126.tar.gz +7c9a7c76e200ead4e6447fe4b105f676 libnatpmp-20140401.tar.gz