rpms/g-wrap/devel g-wrap.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25129

Modified Files:
	g-wrap.spec 
Log Message:
spec cleanups



Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- g-wrap.spec	12 Jul 2006 06:19:12 -0000	1.31
+++ g-wrap.spec	11 Jan 2007 20:01:59 -0000	1.32
@@ -1,20 +1,20 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
 Version: 1.9.6
-Release: 7.1
+Release: 8
 Group: Development/Libraries
 License: GPL
 Requires: guile
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/ldconfig
-Source: ftp://ftp.gnucash.org/pub/g-wrap/g-wrap-%{version}.tar.gz
+URL: http://www.nongnu.org/g-wrap/
+Source: http://savannah.nongnu.org/download/g-wrap/g-wrap-%{version}.tar.gz
 Source1: ia64.tar.gz
 Patch0: g-wrap-info.patch
 Patch1: g-wrap-glib2.patch
 Patch2: g-wrap-staticffi.patch
 Patch3: g-wrap-ffiexecstack.patch
 Patch4: g-wrap-consistent.patch
-BuildPrereq: guile-devel slib glib2-devel pkgconfig autoconf
+BuildRequires: guile-devel slib glib2-devel pkgconfig autoconf
 
 %description
 This is a tool for specifying types, functions, and constants to
@@ -22,9 +22,10 @@
 interface these to the Guile and RScheme interpreters in particular.
 
 %package devel
-Summary: Include files and libraries needed for g-wrap development.
+Summary: Include files and libraries needed for g-wrap development
 Group: Development/Libraries
-Prereq: /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(postun): /sbin/install-info
 Requires: g-wrap = %{version}, guile-devel, pkgconfig
 
 %description devel
@@ -50,11 +51,11 @@
 autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --disable-static
-make
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool
 
 # Move ffi headers out of standard locations to avoid apps picking
 # them up, and remove the .so. g-wrap headers are arch-dependent, so
@@ -73,6 +74,7 @@
 sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/*
 sed -i "s|<ffi|<g-wrap/ffi|g"  %{buildroot}/%{_includedir}/g-wrap/*.h
 sed -i "s|%{_libdir}/libffi.la||g" %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/*.a
 rm -f %{buildroot}/usr/share/info/dir
 
 %clean
@@ -81,15 +83,13 @@
 %post -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info \
-    --info-dir=%{_infodir} %{_infodir}/g-wrap.info.gz
+/sbin/install-info --info-dir=%{_infodir} %{_infodir}/g-wrap.info.gz
 
 %postun -p /sbin/ldconfig
 
 %postun devel
 if [ "$1" = "0" ]; then
-    /sbin/install-info --delete \
-	--info-dir=%{_infodir} %{_infodir}/g-wrap.info.gz
+    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/g-wrap.info.gz
 fi
 
 %files
@@ -109,6 +109,9 @@
 %doc %{_infodir}/g-wrap.info*
 
 %changelog
+* Thu Jan 11 2007 Bill Nottingham <notting at redhat.com> - 1.9.6-8
+- various spec cleanups
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-7.1
 - rebuild