rpms/geda-utils/FC-6 geda-utils.spec,1.3,1.4

Chitlesh GOORAH (chitlesh) fedora-extras-commits at redhat.com
Sat Jan 13 16:27:47 UTC 2007


Author: chitlesh

Update of /cvs/extras/rpms/geda-utils/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8541/FC-6

Modified Files:
	geda-utils.spec 
Log Message:
auto-import geda-utils-20061020-2 on branch FC-6 from geda-utils-20061020-2.src.rpm


Index: geda-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/geda-utils/FC-6/geda-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geda-utils.spec	3 Nov 2006 20:15:22 -0000	1.3
+++ geda-utils.spec	13 Jan 2007 16:27:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           geda-utils
 Version:        20061020
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Several utilities for the gEDA project
 Group:          Applications/Engineering
@@ -20,7 +20,30 @@
 %prep
 %setup -q
 
+# use of guile-1.6
+cp -p configure configure.guile16
+sed -i "s|guile|guile-1.6|" configure
+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
+export GUILE_CFLAGS="-I%{_includedir}/libguile16 -I%{_includedir}/guile16"
+export GUILE_LDFLAGS="-L%{_libdir}/guile16"
+
 %configure --with-docdir=%{_datadir}/gEDA/docs
 %{__make} %{?_smp_mflags}
 
@@ -65,6 +88,9 @@
 %{_datadir}/gEDA/docs/readmes/README*
 
 %Changelog
+* Mon Jan 08 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-2
+- rebuilt under compat-guile-16
+
 * Thu Nov 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 20061020-1
 - New Upstream Release
 




More information about the fedora-extras-commits mailing list