rpms/libgeda/devel libgeda.spec,1.5,1.6

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/libgeda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4125/devel

Modified Files:
	libgeda.spec 
Log Message:
auto-import libgeda-20061020-3 on branch devel from libgeda-20061020-3.src.rpm


Index: libgeda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgeda/devel/libgeda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgeda.spec	3 Nov 2006 20:15:51 -0000	1.5
+++ libgeda.spec	13 Jan 2007 15:57:44 -0000	1.6
@@ -1,6 +1,7 @@
+# dropped support for FC5
 Name:            libgeda
 Version:         20061020
-Release:         1%{?dist}
+Release:         3%{?dist}
 Summary:         Libraries for the gEDA project
 
 Group:           System Environment/Libraries
@@ -8,14 +9,15 @@
 URL:             http://www.geda.seul.org
 
 Source:          ftp://ftp.geda.seul.org/pub/geda/devel/%{version}/%{name}-%{version}.tar.gz
-#Patch0:          %{name}-%{version}-arc.patch
-#Patch1:          %{name}-%{version}-configure.patch
+
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):  /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
 
-BuildRequires:   gtk2-devel, guile-devel, autoconf, gd-devel
+BuildRequires:   gtk2-devel, gd-devel
+
+BuildRequires: compat-guile-16-devel
 
 %description
 This package contains libgeda, the library needed by gEDA applications.
@@ -36,7 +38,8 @@
 Summary:         Development files for the libgeda library
 Group:           Development/Libraries
 Requires:        %{name} = %{version}-%{release}
-Requires:        guile-devel, gtk2-devel, gd-devel
+Requires:        gtk2-devel, gd-devel
+Requires: compat-guile-16-devel
 
 %description devel
 Development files for libgeda library
@@ -44,15 +47,31 @@
 
 %prep
 %setup -q
-#%patch0 -p0 -b o_arc_basic.c
-#%patch1 -p0 -b configure.ac
+
+cp -p configure configure.guile16
+sed -i "s|guile|guile-1.6|" configure
+sed -i "s|guile-1.6-config|guile-config-1.6|" configure src/create_proto
+sed -i "s|guile-1.6-tools|guile-tools-1.6|" configure
+sed -i "s|ac_cv_lib_guile-1.6|ac_cv_lib_guile|" configure
+sed -i "s|-lguile-1.6|-lguile16|" configure
+sed -i "s|guile-1.6version|guileversion|" configure
+sed -i "s|#include <libguile-1.6.h>|#include <libguile16.h>|" configure
+# v20061020 : file: include/libgeda.h
+# Keep timestamps for files not needed to be modified
+for f in `find . -name \*.h -or -name \*.c` ; do
+   if grep -q libguile $f ; then
+      sed -i.guile16 -e 's|libguile.h|libguile16.h|' $f
+   fi
+   if grep -q 'guile/' $f ; then
+      sed -i 's|guile/\(.*\)h|guile16/\1h|' $f
+   fi
+done
+
 
 %build
 
-autoconf
-for f in `find . -name \*.c -or -name \*.h` ; do
-   sed -i -e 's|gdgeda/gd.h|gd.h|' $f
-done
+export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+export GUILE_LDFLAGS="-L%{_libdir}/guile16"
 
 %configure --disable-static
 %{__make} %{?_smp_mflags}
@@ -91,6 +110,12 @@
 
 
 %Changelog
+* Sat Jan 06 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 20061020-3
+- Fix the replacement for guile 1.6
+
+* Fri Dec 07 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 20061020-2
+- Downgraded to guile-1.6 for BR
+
 * Wed Nov 01 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
 - New upstreeam release