- updated to 1.9.7, updated glib2 patch

- don't package srfi-34.scm as it's already in recent guile

Changed files:
    g-wrap.spec -> 1.49

diff --git a/g-wrap.spec b/g-wrap.spec
index 5b3a0a0aa89fe3e37b71483952f9787c499fcfdf..19d6449a3e671adf99b0186da289993961a9bfbb 100644 (file)
--- a/g-wrap.spec
+++ b/g-wrap.spec
@@ -2,24 +2,25 @@ Summary:      A utility for automatically generating glue code to export C libraries
 Summary(pl):   Narzêdzie do eksportowania bibliotek C do interpreterów Scheme
 Summary(pt_BR):        Um utilitário para geração automática de código para exportar bibliotecas C para guile scheme e rscheme
 Name:          g-wrap
-Version:       1.9.6
+Version:       1.9.7
 Release:       1
 Epoch:         2
 License:       LGPL
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/g-wrap/%{name}-%{version}.tar.gz
-# Source0-md5: 4d83964f51376500eedced538c1620cb
+# Source0-md5: 4e980fd3f464d53ecee12184569c32bf
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-glib2.patch
-BuildRequires: autoconf
+URL:           http://www.nongnu.org/g-wrap/
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-BuildRequires: glib2-devel
-BuildRequires: guile-devel >= 1.4.1
-# guile-gtk for gtk wrappers
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: guile-devel >= 5:1.8
 BuildRequires: libffi-devel
 BuildRequires: libtool
-BuildRequires: slib
+BuildRequires: pkgconfig
 BuildRequires: texinfo
+Requires:      guile > 5:1.8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +44,7 @@ Summary(pl):  Pliki nag
 Summary(pt_BR):        Arquivos de inclusão e bibliotecas para o g-wrap
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      guile-devel >= 1.4.1
+Requires:      guile-devel >= 5:1.8
 
 %description devel
 headers for developing programs using g-wrap.
@@ -76,7 +77,11 @@ Bibliotecas est
 %patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 
 %{__make}
@@ -87,10 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp -a lib/srfi $RPM_BUILD_ROOT%{_datadir}/guile/site/srfi
-
-# modules
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgw-*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/g-wrap/modules/libgw-*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,32 +108,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README ChangeLog
-%attr(755,root,root) %{_libdir}/libgw-guile-standard.so.*.*.*
-%attr(755,root,root) %{_prefix}/lib/libgw-guile-gw-glib.so.*.*.*
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_libdir}/libgwrap-core-runtime.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgwrap-guile-runtime.so.*.*.*
-
+%dir %{_libdir}/g-wrap
+%dir %{_libdir}/g-wrap/modules
+%attr(755,root,root) %{_libdir}/g-wrap/modules/libgw-guile-gw-glib.so*
+%attr(755,root,root) %{_libdir}/g-wrap/modules/libgw-guile-standard.so*
 %dir %{_datadir}/guile
 %dir %{_datadir}/guile/site
 %{_datadir}/guile/site/g-wrap
-%{_datadir}/guile/site/srfi
+%dir %{_datadir}/guile/site/srfi
+# srfi-34.scm already in recent guile
+%{_datadir}/guile/site/srfi/srfi-35.scm
 %{_datadir}/guile/site/g-wrap.scm
 %{_infodir}/g-wrap.info*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/g-wrap-config
-%attr(755,root,root) %{_libdir}/libgw-guile-standard.so
 %attr(755,root,root) %{_libdir}/libgwrap-core-runtime.so
 %attr(755,root,root) %{_libdir}/libgwrap-guile-runtime.so
-%{_libdir}/libgw-guile-standard.la
 %{_libdir}/libgwrap-core-runtime.la
 %{_libdir}/libgwrap-guile-runtime.la
-%{_prefix}/lib/libgw-guile-gw-glib.la
 %{_includedir}/g-wrap
 %{_includedir}/g-wrap*.h
 %{_pkgconfigdir}/g-wrap-2.0-guile.pc
+%{_aclocaldir}/g-wrap.m4
 
 %files static
 %defattr(644,root,root,755)