diff --git a/.abf.yml b/.abf.yml index f37a34c..912153a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: + download.php?file=miniupnpd-2.3.7.tar.gz: c491b053669dc637870ab8fa563b1d10371dd66d miniupnpd-1.8.20140523.tar.gz: 1f29d76df57fcf4046c7cb9c7312d7fbc3f28e26 diff --git a/miniupnpd.rpmlintrc b/miniupnpd.rpmlintrc new file mode 100644 index 0000000..89ea7d9 --- /dev/null +++ b/miniupnpd.rpmlintrc @@ -0,0 +1 @@ +addFilter("E: executable-marked-as-config-file") diff --git a/miniupnpd.spec b/miniupnpd.spec index 383ccaf..e3570c1 100644 --- a/miniupnpd.spec +++ b/miniupnpd.spec @@ -1,15 +1,17 @@ Summary: The UPNP & NAT-PMP implementation Name: miniupnpd -Version: 1.8.20140523 -Release: 4 +Version: 2.3.7 +Release: 1 License: GPLv2+ Group: System/Servers -Url: http://miniupnp.free.fr -Source0: http://miniupnp.free.fr/files/download.php?file=/%{name}-%{version}.tar.gz +URL: http://miniupnp.free.fr +#Source0: http://miniupnp.free.fr/files/download.php?file=/%{name}-%{version}.tar.gz +Source0: http://miniupnp.free.fr/files/download.php?file=%{name}-%{version}.tar.gz Source1: miniupnpd.service Patch0: miniupnpd-1.8.20140523-makefile.patch BuildRequires: iptables-devel BuildRequires: iptables-ip4tc-devel +BuildRequires: kernel-generic-devel BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(libnetfilter_conntrack) Requires: iptables @@ -42,22 +44,28 @@ See http://www.upnp.org/ for more details on UPnP. %prep %setup -q -mv Makefile.linux Makefile -%patch0 -p1 +#mv Makefile.linux Makefile +#patch0 -p1 %build -make config.h -sed -i \ - -e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \ - config.h || die +#make config.h +#sed -i \ +# -e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \ +# config.h || die + +#make CC=gcc CFLAGS="%{optflags}" +#make -f Makefile.linux config.h +#make -f Makefile.linux +./configure +%make -%make CC=gcc CFLAGS="%{optflags}" %install -mkdir -p %{buildroot}%{_mandir}/man8/ +%makeinstall_std +#mkdir -p %{buildroot}%{_mandir}/man8/ -make install PREFIX="%{buildroot}" STRIP="true" +#make install PREFIX="%{buildroot}" STRIP="true" rm -f %{buildroot}%{_sysconfdir}/init.d/miniupnpd rm -f %{buildroot}%{_sysconfdir}/miniupnpd/miniupnpd.conf~ -install -D -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service +install -Dm0755 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service