- added mktemp patch (security)

- added DESTDIR patch
- fixed using macros

Changed files:
    gawk.spec -> 1.11

diff --git a/gawk.spec b/gawk.spec
index 83968db3959bd133f4e3a174be4306412873ed22..ee8e2d44dd4b7f7a059268d9406c429f5c24c8c6 100644 (file)
--- a/gawk.spec
+++ b/gawk.spec
@@ -5,7 +5,7 @@ Summary(pl):    Narz
 Summary(tr):   GNU araçlarý metin düzenleyici
 Name:          gawk
 Version:       3.0.3
-Release:       8
+Release:       9
 Copyright:     GPL
 Group:         Utilities/Text
 Group(pl):     Narzêdzia/Tekst
@@ -13,8 +13,14 @@ Source0:     ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
 Source1:       ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}-ps.tar.gz
 Patch0:                gawk-unaligned.patch
 Patch1:                gawk-info.patch
+Patch2:                gawk-mktemp.patch
+Patch3:                gawk-DESTDIR.patch
 Buildroot:     /tmp/%{name}-%{version}-root
 
+%define                _libexecdir     %{_prefix}/lib
+%define                _libdir         %{_prefix}/lib
+%define                _exec_prefix    /
+
 %description
 This is GNU Awk. It should be upwardly compatible with the Bell Labs
 research version of awk.  It is almost completely compliant with the
@@ -54,24 +60,26 @@ biridir.
 %setup -q -b 1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target} \
-       --prefix=/usr
+LDFLAGS="-s"; export LDFLAGS
+%configure
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT/usr/bin
 
-make install prefix=$RPM_BUILD_ROOT/usr bindir=$RPM_BUILD_ROOT/bin
+make install \
+       DESTDIR=$RPM_BUILD_ROOT 
 
 echo ".so gawk.1" > $RPM_BUILD_ROOT%{_mandir}/man1/awk.1
-ln -sf /bin/gawk $RPM_BUILD_ROOT%{_bindir}/awk 
-ln -sf /bin/gawk $RPM_BUILD_ROOT%{_bindir}/gawk 
+ln -sf %{_bindir}/gawk $RPM_BUILD_ROOT/usr/bin/awk 
+ln -sf %{_bindir}/gawk $RPM_BUILD_ROOT/usr/bin/gawk 
 
-gzip -9f $RPM_BUILD_ROOT/usr/{info/gawk.info*,man/man1/*} \
+gzip -9f $RPM_BUILD_ROOT{%{_infodir}/gawk.info*,%{_mandir}/man1/*} \
        README ACKNOWLEDGMENT FUTURES LIMITATIONS NEWS PORTS \
        README_d/README.linux POSIX.STD doc/gawk.ps doc/awkcard.ps
 
@@ -89,11 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *gz README_d/README.linux.gz doc/*.ps.gz
-%attr(755,root,root) /bin/*
+%attr(755,root,root) /usr/bin/*
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 %{_infodir}/*info*
-%attr(755,root,root) /usr/libexec/awk
+%attr(755,root,root) %{_libdir}/awk
 %{_datadir}/awk
 
 %changelog