X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdbm.spec;h=1098b0fa2ff71637142eae56f688c8719edbd2b1;hb=411b9b2328b0c7b0627ed08148e0a153852b025f;hp=a741462b237dd40a329327ea7a21e8d7d7cd180a;hpb=1fc778276f889fa39b7d01320ae72a7fba809392;p=packages%2Fgdbm.git

diff --git a/gdbm.spec b/gdbm.spec
index a741462..1098b0f 100644
--- a/gdbm.spec
+++ b/gdbm.spec
@@ -3,15 +3,16 @@ Summary(de):	GNU-Datenbank-Library f
 Summary(fr):	La librairie GNU de bases de données pout le langage C.
 Summary(pl):	GNU biblioteka bazy danych la jêzyka C
 Name:		gdbm
-Version:	1.7.3
-Release:	22
+Version:	1.8.0
+Release:	3
 Copyright:	GPL
 Group:		Libraries
 Group(pl):	Biblioteki
 Source:		ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
-Patch0:		gdbm-shlib.patch
-Patch1:		gdbm-info.patch
-Patch2:		gdbm-configure.patch
+Patch0:		gdbm-info.patch
+Patch1:		gdbm-DESTDIR.patch
+BuildRequires:	libtool
+BuildRequires:	autoconf
 Buildroot:	/tmp/%{name}-%{version}-root
 
 %description
@@ -49,7 +50,7 @@ Summary(tr):	gdbm i
 Group:		Development/Libraries
 Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
-Prereq:		/sbin/install-info
+Prereq:		/usr/sbin/fix-info-dir
 
 %description devel
 These are the development libraries and header files for gdbm, the
@@ -85,113 +86,66 @@ Requires:	%{name}-devel = %{version}
 Static gdbm library.
 
 %prep
-%setup -q
+%setup  -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-mkdir shared
+libtoolize --copy --force
 aclocal
 autoheader
+autoconf
 %configure
 
 make CFLAGS="$RPM_OPT_FLAGS"
-make CFLAGS="$RPM_OPT_FLAGS" shared
 
 makeinfo gdbm.texinfo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/{lib,include,info,man/man3}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}} \
+	   $RPM_BUILD_ROOT{%{_mandir}/man3,%{_infodir}}
 
-make install prefix=$RPM_BUILD_ROOT/usr
+make install \
+	prefix=%{_prefix} \
+	exec_prefix=%{_exec_prefix} \
+	binprefix=%{_exec_prefix} \
+	manprefix=%{_prefix} \
+	libdir=%{_libdir} \
+	includedir=%{_includedir} \
+	infodir=%{_infodir} \
+	man3dir=%{_mandir}/man3 \
+	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf libgdbm.so.2.0.0 $RPM_BUILD_ROOT/usr/lib/libgdbm.so
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
 
-strip --strip-unneeded $RPM_BUILD_ROOT/usr/lib/lib*.so.*.*
-
-gzip -fn9 $RPM_BUILD_ROOT/usr/{info/gdbm*info*,man/man3/*}
+gzip -fn9 $RPM_BUILD_ROOT{%{_infodir}/gdbm*info*,%{_mandir}/man3/*}
 
 %post -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info /usr/info/gdbm.info.gz /etc/info-dir
+/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun -p /sbin/ldconfig
 
-%preun devel
-if [ "$1" = "0" ]; then
-	/sbin/install-info --delete /usr/info/gdbm.info.gz /etc/info-dir
-fi
+%postun devel
+/usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /usr/lib/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) /usr/lib/lib*.so
-/usr/man/man3/*
-/usr/include/*
-/usr/info/gdbm*
+%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/lib*.la
+%{_mandir}/man3/*
+%{_includedir}/*
+%{_infodir}/gdbm*
 
 %files static
 %defattr(644,root,root,755)
-/usr/lib/lib*.a
-
-%changelog
-* Thu Apr 29 1999 Artur Frysiak <wiget@pld.org.pl>
-  [1.7.3-22]
-- used %%configure macro
-- added gdbm-configure.patch
-
-* Sun Mar 14 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.3-21]
-- added --strip-unneeded parameter on striping shared libraries,
-- removed man group from man pages.
-
-* Mon Jan 04 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.3-20]
-- standarized {un}registering info pages (added gdbm-info.patch),
-- added gzipping man pages.
-
-* Sun Nov 22 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.3-19]
-- removed "Prereq: /sbin/install-info" from static,
-- fixed --entry text on {un}registering info page for ed in %post
-  %preun in devel.
-
-* Wed Sep 30 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-- build against glibc-2.1,
-- translation modified for pl.
-
-* Sun Aug 30 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.3-18]
-- added -q %setup parameter,
-- changed Buildroot to /tmp/%%{name}-%%{version}-root,
-- added using %%{name} and %%{version} in Source,
-- added static subpackage,
-- changed dependencies to "Requires: %%{name} = %%{version}" in devel
-  subpackage,
-- added stripping shared libraries,
-- added %attr and %defattr macros in %files (allows build package from
-  non-root account).
-
-* Thu May 07 1998 Prospector System <bugs@redhat.com>
-- translations modified for de, fr, tr
-
-* Thu Apr 30 1998 Cristian Gafton <gafton@redhat.com>
-- gdbm-devel moved to Development/Libraries
-
-* Wed Apr 08 1998 Cristian Gafton <gafton@redhat.com>
-- buildroot and built for Manhattan
-
-* Tue Oct 14 1997 Donnie Barnes <djb@redhat.com>
-- spec file cleanups
-
-* Thu Jun 12 1997 Erik Troan <ewt@redhat.com>
-- built against glibc
+%{_libdir}/lib*.a