- updated to 1.8.3 (warning: SONAME has changed)

- removed obsolete DESTDIR patch and hacks
- added some docs

Changed files:
    gdbm-DESTDIR.patch -> 1.3
    gdbm.spec -> 1.60

diff --git a/gdbm-DESTDIR.patch b/gdbm-DESTDIR.patch
deleted file mode 100644 (file)
index e734610..0000000
--- a/gdbm-DESTDIR.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gdbm-1.8.0/Makefile.in.orig        Wed May 19 05:16:06 1999
-+++ gdbm-1.8.0/Makefile.in     Thu May 20 10:30:07 1999
-@@ -45,6 +45,8 @@
- man3dir = $(prefix)/man/man3
- manext = 3
- 
-+DESTDIR =
-+
- #### End of system configuration section. ####
- 
- .SUFFIXES:
-@@ -120,20 +122,21 @@
- progs: $(PROGS)
- 
- install: libgdbm.la gdbm.h gdbm.info
--      $(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir)
--      $(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la
--      $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h
--      $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
--              $(man3dir)/gdbm.3
--      $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
--              $(infodir)/gdbm.info
-+      $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) \
-+              $(DESTDIR)$(man3dir) $(DESTDIR)$(infodir)
-+      $(LIBTOOL) install -c libgdbm.la $(DESTDIR)$(libdir)/libgdbm.la
-+      $(INSTALL_DATA) gdbm.h $(DESTDIR)$(includedir)/gdbm.h
-+      $(INSTALL_DATA) $(srcdir)/gdbm.3 \
-+              $(DESTDIR)$(man3dir)/gdbm.3
-+      $(INSTALL_DATA) $(srcdir)/gdbm.info \
-+              $(DESTDIR)$(infodir)/gdbm.info
- 
- install-compat:
-       $(srcdir)/mkinstalldirs $(includedir)
--      $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
--              $(includedir)/dbm.h
--      $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
--              $(includedir)/ndbm.h
-+      $(INSTALL_DATA) $(srcdir)/dbm.h \
-+              $(DESTDIR)$(includedir)/dbm.h
-+      $(INSTALL_DATA) $(srcdir)/ndbm.h \
-+              $(DESTDIR)$(includedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h
- #     rm -f libgdbm.a

diff --git a/gdbm.spec b/gdbm.spec
index d07556b6eb6849e524ddf755f99816b436bfb484..3cd77aac2283d7a9be68037b667a313ad1b54cf6 100644 (file)
--- a/gdbm.spec
+++ b/gdbm.spec
@@ -5,14 +5,13 @@ Summary(pl):  Biblioteka GNU bazy danych dla j
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ÂÁÚÙ ÄÁÎÎÙÈ GNU ÄÌÑ C
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÂÁÚÉ ÄÁÎÉÈ GNU ÄÌÑ C
 Name:          gdbm
-Version:       1.8.0
-Release:       16
+Version:       1.8.3
+Release:       1
 License:       GPL
 Group:         Libraries
 Source0:       ftp://ftp.gnu.org/pub/gnu/gdbm/%{name}-%{version}.tar.gz
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-DESTDIR.patch
-Patch2:                %{name}-jbj.patch
+Patch1:                %{name}-jbj.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -129,7 +128,6 @@ Biblioteka statyczna gdbm.
 %setup  -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -138,28 +136,14 @@ Biblioteka statyczna gdbm.
 %{__autoconf}
 %configure
 
-%{__make} CFLAGS="%{rpmcflags}"
-
-makeinfo gdbm.texinfo
-
-cat .libs/libgdbm.lai|sed -e 's/\/usr\/local\/lib/\/usr\/lib/'>libgdbm.lai.tmp
-mv libgdbm.lai.tmp .libs/libgdbm.lai
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}} \
-          $RPM_BUILD_ROOT{%{_mandir}/man3,%{_infodir}}
 
 %{__make} install install-compat \
-       prefix=%{_prefix} \
-       exec_prefix=%{_exec_prefix} \
-       binprefix=%{_exec_prefix} \
-       manprefix=%{_prefix} \
-       libdir=%{_libdir} \
-       includedir=%{_includedir} \
-       infodir=%{_infodir} \
-       man3dir=%{_mandir}/man3 \
-       DESTDIR=$RPM_BUILD_ROOT
+       INSTALL_ROOT=$RPM_BUILD_ROOT \
+       BINOWN=`id -u` BINGRP=`id -g`
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -175,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel