Accepted patch [#1056544] Improved spec file for building RPMs.

Updated NEWS and THANKS to report/credit cduffy for bug and patch.

3 files changed, 29 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index 95acaff..d8610d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes in 0.9.8 (not yet released)
+
+ * Improved rdiff man page from Debian.
+ 
+ * Improved librsync.spec file for building RPMs.
+
 Changes in 0.9.7 (released 2004-10-10)
 
  * Yet more large file support fixes.
diff --git a/THANKS b/THANKS
index 4d0b3a4..dfdd3fd 100644
--- a/THANKS
+++ b/THANKS
@@ -16,7 +16,7 @@ Andrew Tridgell <tridge@samba.org>
 Paulus Mackerras
 Peter Barker <pbarker@samba.org>
 Neale Banks <neale@lowendale.com.au>
-Luke Kenneth Casson Leighton 
+Luke Kenneth Casson Leighton
 Tim Potter
 Hugh Blemings
 David Gibson
@@ -40,7 +40,7 @@ Contributors for 0.9.6
   - librsync-conf.h addition and config.h issue resolution
 
  * Martin Pool <mbp@users.sourceforge.net>
-  - sf project admin 
+  - sf project admin
   - sf project developers setup
 
  * Donovan Baarda <abo@minkirri.apana.org.au>
@@ -81,7 +81,7 @@ Contributors for 0.9.6
   - large file testing and debugging
 
 
-Contributors for 0.9.7 (release pending)
+Contributors for 0.9.7
 
  * Donovan Baarda <abo@minkirri.apana.org.au>
    - librsync sf project admin
@@ -95,15 +95,22 @@ Contributors for 0.9.7 (release pending)
 
  * John Goerzen <jgoerzen@complete.org>
    - Debian package maintainence
-   
+
  * Dave Coombs <dcoombs@nit.ca>
    - C++ wrapper patch
-   
+
  * Eran Tromer <tromer@users.sourceforge.net>
    - [#855477] buf.c incorrect header order, and fix.
 
    - [#1022764] Reported and diagnosed nasty corruption bug with large
      files.
 
- * Simon Law <sfllaw@debian.org> 
+ * Simon Law <sfllaw@debian.org>
    - [#879763] Fixed problems with unaligned access in mdfour.
+
+
+Contributors for 0.9.8 (release pending)
+
+ * Charles Duffy <cduffy@users.sourceforge.net>
+   - [#1056544] Submitted patch with improved spec file for building RPMs.
+   - [#1056548] Reported man page bug about using '-' for stdin/stdout.
diff --git a/librsync.spec b/librsync.spec
index f1d765a..125f729 100644
--- a/librsync.spec
+++ b/librsync.spec
@@ -1,12 +1,15 @@
 Summary:  	Rsync libraries
 Name:     	librsync
-Version:  	0.9.6
+Version:  	0.9.7
 Release:  	1
-Copyright:	LGPL
+License:	LGPL
 Group:    	System Environment/Libraries
-Source:  	http://prdownloads.sourceforge.net/librsync/librsync-0.9.6.tar.gz?download
+Source:  	http://prdownloads.sourceforge.net/librsync/librsync-%{version}.tar.gz
 URL:       	http://www.sourceforge.net/projects/librsync
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	libtool
+BuildRequires:	autoconf
+BuildRequires:	automake
 
 %description
 librsync implements the "rsync" algorithm, which allows remote
@@ -40,17 +43,13 @@ and incompatible with rsync 2.4.6.
 This package contains header files necessary for developing programs
 based on librsync.
 
-%prep 
+%prep
 %setup
 # The next line is only needed if there are any non-upstream patches.  In
 # this distribution there are none.
-#%patch 
+#%patch
 %build
-libtoolize --force
-aclocal
-autoheader
-automake Makefile popt/Makefile
-autoconf
+./autogen.sh
 ./configure --prefix=/usr --mandir=/usr/share/man/
 make CFLAGS="$RPM_OPT_FLAGS"
 
@@ -68,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING COPYING NEWS README
-%{_libdir}/librsync.la
 %{_bindir}/rdiff
 %{_mandir}/man3/librsync.3.gz
 %{_mandir}/man1/rdiff.1.gz
@@ -77,5 +75,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_prefix}/include/*
 %{_libdir}/librsync.a
+%{_libdir}/librsync.la
 
 %changelog