From 03f4c9a4db45a69fea74de0411de7ec6ad3eedcf Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:01:04 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20gdbm-1.?= =?UTF-8?q?8.0-9.src.rpm=20Tue=20Jun=2012=202001=20Than=20Ngo=20=20-=20fix=20to=20build=20against=20new=20libtool=20Mon?= =?UTF-8?q?=20Mar=2019=202001=20Trond=20Eivind=20Glomsr=F8d=20=20-=20Make=20it=20respect=20RPM=5FOPT=5FFLAGS/CFLAGS=20-?= =?UTF-8?q?=20#32242.=20Patch=20from=20=20=20=20=20dan@D00M.cmc.msu.ru?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gdbm-1.8.0-cflags.patch | 31 +++++++++++++++++++++++++++++++ gdbm.spec | 28 ++++++++++++++++++---------- 2 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 gdbm-1.8.0-cflags.patch diff --git a/gdbm-1.8.0-cflags.patch b/gdbm-1.8.0-cflags.patch new file mode 100644 index 0000000..5a0b53a --- /dev/null +++ b/gdbm-1.8.0-cflags.patch @@ -0,0 +1,31 @@ +--- gdbm-1.8.0/Makefile.in.cflags Tue Jun 12 19:50:21 2001 ++++ gdbm-1.8.0/Makefile.in Tue Jun 12 19:57:45 2001 +@@ -17,22 +17,23 @@ + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + +-DEFS = ++DEFS = @DEFS@ + + # Where the system [n]dbm routines are... + LIBS = @LIBS@ -lc + + # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL. +-CFLAGS = -O +-LDFLAGS = ++CPPFLAGS = @CPPFLAGS@ ++CFLAGS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + + # Common prefix for installation directories +-prefix = /usr/local ++prefix = /usr + exec_prefix = $(prefix) + mandir = $(prefix)/man + + # Directory in which to put libgdbm.a. +-libdir = $(exec_prefix)/lib ++libdir = $(prefix)/lib + # The include directory for gdbm.h and dbm.h. + includedir = $(prefix)/include + # Info and man directories. diff --git a/gdbm.spec b/gdbm.spec index 021a907..ec26967 100644 --- a/gdbm.spec +++ b/gdbm.spec @@ -3,14 +3,15 @@ Summary: A GNU set of database routines which use extensible hashing. Name: gdbm Version: 1.8.0 -Release: 6 +Release: 9 Source: ftp://prep.ai.mit.edu/pub/gnu/gdbm-%{version}.tar.gz Patch0: gdbm-1.8.0-jbj.patch Patch1: gdbm-1.8.0-fhs.patch +Patch2: gdbm-1.8.0-cflags.patch Copyright: GPL Group: System Environment/Libraries Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Gdbm is a GNU database indexing library, including routines which use @@ -26,7 +27,7 @@ install gdbm-devel. %package devel Summary: Development libraries and header files for the gdbm library. Group: Development/Libraries -Requires: gdbm +Requires: gdbm = %{version} Prereq: /sbin/install-info %description devel @@ -41,9 +42,12 @@ gdbm database library. You'll also need to install the gdbm package. %setup -q %patch0 -p 1 -b .jbj %patch1 -p 1 -b .fhs +%patch2 -p 1 -b .cflags %build - +aclocal +autoheader +autoconf %configure make @@ -52,12 +56,9 @@ rm -rf ${RPM_BUILD_ROOT} %makeinstall install-compat -{ cd ${RPM_BUILD_ROOT} - ln -sf gdbm/gdbm.h .%{_oldincludedir}/gdbm.h - ln -sf libgdbm.so.2.0.0 .%{_libdir}/libgdbm.so - gzip -9nf .%{_infodir}/gdbm* - rm -f .%{_infodir}/dir -} +pushd $RPM_BUILD_ROOT +ln -sf gdbm/gdbm.h .%{_oldincludedir}/gdbm.h +ln -sf libgdbm.so.2.0.0 .%{_libdir}/libgdbm.so %post -p /sbin/ldconfig @@ -89,6 +90,13 @@ fi rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Jun 12 2001 Than Ngo +- fix to build against new libtool + +* Mon Mar 19 2001 Trond Eivind Glomsrød +- Make it respect RPM_OPT_FLAGS/CFLAGS - #32242. + Patch from dan@D00M.cmc.msu.ru + * Thu Jul 13 2000 Prospector - automatic rebuild