From 0dbb3fc84f01ce64b1a7e4f86d151c1be8f5f421 Mon Sep 17 00:00:00 2001
From: Štěpán Kasal <kasal@fedoraproject.org>
Date: Apr 17 2009 10:40:56 +0000
Subject: Clean up the spec, for merge review.


---

diff --git a/gdbm.spec b/gdbm.spec
index 53bf11a..3889388 100644
--- a/gdbm.spec
+++ b/gdbm.spec
@@ -1,15 +1,15 @@
-Summary: A GNU set of database routines which use extensible hashing.
+Summary: A GNU set of database routines which use extensible hashing
 Name: gdbm
 Version: 1.8.0
-Release: 31%{?dist}
-Source: ftp://ftp.gnu.org/gnu/gdbm-%{version}.tar.gz
+Release: 32%{?dist}
+Source: http://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
 Patch0: gdbm-1.8.0-jbj.patch
 Patch1: gdbm-1.8.0-fhs.patch
 Patch3: gdbm-1.8.0-64offset.patch
 License: GPLv2+
 URL: http://www.gnu.org/software/gdbm/
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libtool
 
 %description
@@ -24,10 +24,11 @@ database routines, you should install gdbm.  You'll also need to
 install gdbm-devel.
 
 %package devel
-Summary: Development libraries and header files for the gdbm library.
+Summary: Development libraries and header files for the gdbm library
 Group: Development/Libraries
-Requires: gdbm = %{version}
-Prereq: /sbin/install-info
+Requires: %{name} = %{version}-%{release}
+Requires(post): info
+Requires(preun): info
 
 %description devel
 Gdbm-devel contains the development libraries and header files for
@@ -39,8 +40,8 @@ gdbm database library.  You'll also need to install the gdbm package.
 
 %prep
 %setup -q
-%patch0 -p 1 -b .jbj
-%patch1 -p 1 -b .fhs
+%patch0 -p1 -b .jbj
+%patch1 -p1 -b .fhs
 %patch3 -p1 -b .offset
 
 %build
@@ -71,20 +72,22 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgdbm.la
 %postun -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database." || :
+/sbin/install-info %{_infodir}/gdbm.info.gz %{_infodir}/dir \
+      --entry="* gdbm: (gdbm).                   The GNU Database." || :
 
 %preun devel
 if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir --entry="* gdbm: (gdbm).                   The GNU Database." || :
+   /sbin/install-info --delete %{_infodir}/gdbm.info.gz %{_infodir}/dir \
+      --entry="* gdbm: (gdbm).                   The GNU Database." || :
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING NEWS README
 %{_libdir}/libgdbm.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libgdbm.so
 %{_libdir}/libgdbm.a
 %{_includedir}/gdbm*
@@ -95,6 +98,9 @@ fi
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Apr 17 2009 Stepan Kasal <skasal@redhat.com> - 1.8.0-32
+- Clean up the spec, for merge review.
+
 * Fri Feb 27 2009 Stepan Kasal <skasal@redhat.com> - 1.8.0-31
 - drop *-cflags.patch, move all makefile fixes to *-fhs.patch
 - propagate libdir to Makefile; no need to set it on cmdline
@@ -154,7 +160,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - run make with libdir overridden so that it has the value passed to configure
   instead of $(prefix)/lib
 
-* Wed Jul 24 2002 Trond Eivind Glomsr�d <teg@redhat.com> 1.8.0-18
+* Wed Jul 24 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.8.0-18
 - Remove cflags for large database support - not compatible 
   with databases without it
 
@@ -164,18 +170,18 @@ rm -rf ${RPM_BUILD_ROOT}
 * Thu May 23 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 
-* Thu Apr 25 2002 Trond Eivind Glomsr�d <teg@redhat.com> 1.8.0-15
+* Thu Apr 25 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.8.0-15
 - Use 64bit offset
 - Patch to make the above not break from downsj@downsj.com (#63980) 
 
-* Tue Feb 26 2002 Trond Eivind Glomsr�d <teg@redhat.com> 1.8.0-14
+* Tue Feb 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.8.0-14
 - Rebuild
 
-* Fri Jan 25 2002 Trond Eivind Glomsr�d <teg@redhat.com> 1.8.0-13
+* Fri Jan 25 2002 Trond Eivind Glomsrød <teg@redhat.com> 1.8.0-13
 - Update location
 - auto* changes to make it build
 
-* Wed Oct 17 2001 Trond Eivind Glomsr�d <teg@redhat.com> 1.8.0-11
+* Wed Oct 17 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.8.0-11
 - Add URL (# 54607)
 
 * Mon Jun 25 2001 Nalin Dahyabhai <nalin@redhat.com>
@@ -185,7 +191,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue Jun 12 2001 Than Ngo <than@redhat.com>
 - fix to build against new libtool
 
-* Mon Mar 19 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+* Mon Mar 19 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Make it respect RPM_OPT_FLAGS/CFLAGS - #32242. 
   Patch from dan@D00M.cmc.msu.ru