- updated to 1.3.3,

- added info patch with info index entry fix for mpatrol,
- simplifications in %build and %install,
- added texinfo to BuildRequires,
- removed Source1 with documemtiations in other formats.

Changed files:
    mpatrol.spec -> 1.7

diff --git a/mpatrol.spec b/mpatrol.spec
index 634a9a0fca4ce32224746668e888fa4f0d46efcf..8e08beca76940fb29cec14e7f7fad9c0249f935a 100644 (file)
--- a/mpatrol.spec
+++ b/mpatrol.spec
@@ -1,12 +1,13 @@
 Summary:       A library for controlling and tracing dynamic memory allocations
 Name:          mpatrol
-Version:       1.2.3
+Version:       1.3.3
 Release:       1
 License:       LGPL
 Group:         Development/Debuggers
 Group(pl):     Programowanie/Odpluskwiacze
 Source0:       http://www.cbmamiga.demon.co.uk/mpatrol/files/%{name}_%{version}.tar.gz
-Source1:       http://www.cbmamiga.demon.co.uk/mpatrol/files/%{name}_doc.tar.gz
+Patch0:                %{name}-info.patch
+BuildRequires: texinfo
 URL:           http://www.cbmamiga.demon.co.uk/mpatrol/index.html
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,50 +26,41 @@ generate. A wide variety of library settings can also be changed at
 run-time via an environment variable, thus removing the need to
 recompile or relink in order to change the library's behaviour.
 
-
 %prep
-%setup -q -n mpatrol -b 1
-
+%setup -q -n mpatrol
+%patch -p1
 
 %build
-cd build/unix
-%{__make} libmpatrol.a libmpatrol.so mpatrol mprof mleak OFLAGS="$RPM_OPT_FLAGS"
+(cd build/unix
+ %{__make} libmpatrol.a libmpatrol.so mpatrol mprof mleak \
+       OFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}"
+)
+(cd doc; makeinfo mpatrol.texi)
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_infodir}} \
        $RPM_BUILD_ROOT{%{_libdir},%{_mandir}/man{1,3}}
 
-BINARIES="mpatrol mprof mleak"
-for f in $BINARIES; do 
-       install -s build/unix/$f $RPM_BUILD_ROOT%{_bindir}
-done 
+install build/unix/{mpatrol,mprof,mleak} $RPM_BUILD_ROOT%{_bindir}
 
 install src/mpatrol.h $RPM_BUILD_ROOT%{_includedir}
-install build/unix/libmpatrol.a $RPM_BUILD_ROOT%{_libdir}
-cp build/unix/libmpatrol.so* $RPM_BUILD_ROOT%{_libdir}
-
-
-
-gzip -9nf doc/mpatrol.info 
-install doc/mpatrol.info.gz $RPM_BUILD_ROOT%{_infodir}
+install build/unix/libmpatrol.{a,so*} $RPM_BUILD_ROOT%{_libdir}
 
-MANUALS="man1/mpatrol.1 man1/mprof.1 man1/mleak.1 man3/mpatrol.3"
-for f in $MANUALS; do 
-       gzip -9nf man/$f
-       install man/$f.gz $RPM_BUILD_ROOT%{_mandir}/`dirname $f`
-done
+install doc/mpatrol.info* $RPM_BUILD_ROOT%{_infodir}
+install man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+install man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3
 
-gzip -9nf {README,FAQ,NEWS,ChangeLog}
+gzip -9nf README NEWS ChangeLog
 
 %files
 %defattr(644,root,root,755)
+%doc *.gz
 %attr(755,root,root) %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/*
 %{_infodir}/*
 %{_mandir}/man[13]/*
-%doc {README,FAQ,NEWS,ChangeLog}.gz
 
 %post
 /sbin/ldconfig