- adapterized and made spec %%debug ready or added using %%rpm*flags macros

Changed files:
    fwtk.spec -> 1.7

diff --git a/fwtk.spec b/fwtk.spec
index 5c72a709088813249a7054fe46dca2a79147bb41..bd3444ffde9fa91b27840968523b65848b2a8f3d 100644 (file)
--- a/fwtk.spec
+++ b/fwtk.spec
@@ -5,17 +5,18 @@ Version:      2.1
 Release:       1
 Copyright:     see LICENSE file (redistribution restricted)
 Group:         Networking/Daemons
+Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
 # How to get sources - see http://www.fwtk.org/ and http://www.tis.com/
 Source0:       %{name}%{version}.tar.Z
 Source1:       %{name}-doc-only.tar.Z
 Source2:       http://www.fwtk.org/fwtk/patches/%{name}-summ.pl.gz
-Patch0:                fwtk2.1-ipv6-19990423-PLD.patch
-Patch1:                fwtk-ndbm.patch
-Patch2:                fwtk-linux.patch
-Patch3:                fwtk-massfix.patch
-Patch4:                fwtk-ftp-plugin.patch
-Patch5:                fwtk-config.patch
+Patch0:                %{name}2.1-ipv6-19990423-PLD.patch
+Patch1:                %{name}-ndbm.patch
+Patch2:                %{name}-linux.patch
+Patch3:                %{name}-massfix.patch
+Patch4:                %{name}-ftp-plugin.patch
+Patch5:                %{name}-config.patch
 URL:           http://www.fwtk.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,10 +37,10 @@ Firewall Toolkit - narz
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-cp Makefile.config.linux Makefile.config
+cp -f Makefile.config.linux Makefile.config
 
 %build
-RPM_OPT="$RPM_OPT_FLAGS" make
+RPM_OPT="%{rpmcflags}" make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,18 +48,18 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man{3,5,8}}
 %{__make} install \
        DEST=$RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_sbindir}/netperm-table $RPM_BUILD_ROOT%{_sysconfdir}/
 
-cp fwtk/doc/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3/
-cp fwtk/doc/man/*.5 $RPM_BUILD_ROOT%{_mandir}/man5/
-cp fwtk/doc/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+mv -f $RPM_BUILD_ROOT%{_sbindir}/netperm-table $RPM_BUILD_ROOT%{_sysconfdir}/
+
+install fwtk/doc/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3/
+install fwtk/doc/man/*.5 $RPM_BUILD_ROOT%{_mandir}/man5/
+install fwtk/doc/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}
-gzip -9nf $RPM_BUILD_ROOT%{_sbindir}/*.gz
+gunzip $RPM_BUILD_ROOT%{_sbindir}/*.gz
 
-strip $RPM_BUILD_ROOT%{_sbindir}/* || :
 rm -f config/Makefile
-gzip -9nf CHANGES LICENSE README fwtk/doc/*.* config/* $RPM_BUILD_ROOT%{_mandir}/man*/*
+gzip -9nf CHANGES LICENSE README fwtk/doc/*.* config/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT