From ca74d7fcb13e9b83677e613434b8316407e379b2 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Wed, 8 Aug 2007 16:12:08 +0000
Subject: [PATCH] - Minor tweaks for proper doc/man page installation.

---
 ldns.spec | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/ldns.spec b/ldns.spec
index b217d7e..1798c95 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -1,14 +1,14 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Patch0: ldns-1.2.x-key2ds-SHA256.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
+BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen, perl
 
 %description
 ldns is a library with the aim to simplify DNS programing in C. All
@@ -27,12 +27,11 @@ The devel package contains the ldns library and the include files
 %prep
 %setup -q 
 %patch0 
-# left by upstream
-rm config.guess config.sub ltmain.sh
-chmod a-x doc/doxyparse.pl
-#temp enable
-libtoolize
-autoreconf
+
+# To built svn snapshots
+#rm config.guess config.sub ltmain.sh
+#libtoolize
+#autoreconf
 
 %configure --disable-rpath
 
@@ -47,17 +46,16 @@ make %{?_smp_mflags} doc
 %install
 rm -rf %{buildroot}
 
-export DESTDIR=%{buildroot}
-make install
-make install-doc
+make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install-doc
+
+rm doc/doxyparse.pl
 #remove doc stubs
 rm -rf doc/.svn
-#remove double set of man pages
-rm -rf doc/man
 # remove .la files
 rm -rf %{buildroot}%{_libdir}/*.la
-(cd drill ; make install)
-(cd examples; make install)
+(cd drill ; make DESTDIR=%{buildroot} install)
+(cd examples; make DESTDIR=%{buildroot} install)
 
 %clean
 rm -rf %{buildroot}
@@ -82,8 +80,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-* Mon Aug  8 2007 Paul Wouters <paul@xelerance.com> 1.2.0-4
+* Mon Aug  8 2007 Paul Wouters <paul@xelerance.com> 1.2.0-5
 - Added sha256 DS record patch to ldns-key2ds
+- Minor tweaks for proper doc/man page installation.
 
 * Mon Aug  6 2007 Paul Wouters <paul@xelerance.com> 1.2.0-2
 - Own the /usr/include/ldns directory (bug #233858)