rpms/TeXmacs/FC-6 TeXmacs.spec, 1.42, 1.43 TeXmacs-1.0.6.1-guile18.patch, 1.1, NONE

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/TeXmacs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30325

Modified Files:
	TeXmacs.spec 
Removed Files:
	TeXmacs-1.0.6.1-guile18.patch 
Log Message:



Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-6/TeXmacs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TeXmacs.spec	27 Oct 2006 18:36:35 -0000	1.42
+++ TeXmacs.spec	4 Dec 2006 21:16:34 -0000	1.43
@@ -15,7 +15,7 @@
 Requires:	tetex
 Requires:	tetex-fonts
 Requires:	ghostscript
-BuildRequires:	guile-devel
+BuildRequires:	compat-libguile-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	tetex
 BuildRequires:  freetype-devel
@@ -54,8 +54,11 @@
 
 %prep
 %setup -q -n TeXmacs-%{version}-src
-#%patch2 -p1
-perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
+%patch2 -p1
+sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
+sed -i "s|guile-config|guile-config-1.6|" configure* 
+sed -i "s|guile --version|guile-1.6 --version|" configure* 
+
 
 
 %build
@@ -66,9 +69,10 @@
 %install
 rm -fr $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-export GUILE_DATA_PATH=`guile-config info pkgdatadir`
-export GUILE_LOAD_PATH=`find $GUILE_DATA_PATH -type d -name ice-9`
+export GUILE_DATA_PATH=%{_datadir}/guile
+export GUILE_LOAD_PATH=$GUILE_DATA_PATH/1.6/ice-9
 cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs
+chmod -f 644 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9/*
 chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
@@ -166,11 +170,6 @@
 * Mon May 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.2-1
 - new version 1.0.6.2
 
-* Tue May 16 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.1-4
-- added patch for new guile-1.8
-- added buildreq for libtool-ltdl-devel
-- fixed command to find ice-9 directory
-
 * Fri May 12 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.0.6.1-1
 - new version 1.0.6.1
 
@@ -276,27 +275,3 @@
 
 * Wed Nov  5 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:1.0.2.6-0.fdr.1
 - First Fedora release
-
-* Mon Sep 22 2003   Joris van der Hoeven <vdhoeven at texmacs.org>
-- 1.0.1.24 Release tag set by the configure script
-
-* Sat Jun 28 2003   Joris van der Hoeven <vdhoeven at texmacs.org>
-- 1.0.1.16 Moved "TeXmacs-%{version}" in root directory to "TeXmacs"
-
-* Tue Jul 22 2002   Joris van der Hoeven <vdhoeven at texmacs.org>
-- 1.0.0.10 Migrated architecture dependent options to configure.in
-
-* Thu Feb 07 2002   Joris van der Hoeven <vdhoeven at texmacs.org>
-- 0.3.5.14 Added -f for chmod
-
-* Thu Feb 07 2002   Joris van der Hoeven <vdhoeven at texmacs.org>
-- 0.3.5.11 Extra compilation options reduce size of executable
-
-* Sun Nov 26 2001   Joris van der Hoeven <vdhoeven at texmacs.org>
-- 0.3.5.7 TeXmacs mime types & pixmap
-
-* Thu Jul 5 2001   Joris van der Hoeven & Christophe Merlet
-- 0.3.4.3 Further corrections
-
-* Sun Jun 3 2001   Bo Forslund  <bo.forslund at abc.se>
-- 0.3.4.3 Some tiny adjustments in the spec


--- TeXmacs-1.0.6.1-guile18.patch DELETED ---