rpms/plt-scheme/devel plt-dep.patch, NONE, 1.1 plt-scheme.spec, 1.7, 1.8

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20598

Modified Files:
	plt-scheme.spec 
Added Files:
	plt-dep.patch 
Log Message:
patch for openssl

plt-dep.patch:

--- NEW FILE plt-dep.patch ---
--- plt/collects/openssl/pre-installer.ss.dep	2005-10-15 16:55:48.000000000 +0200
+++ plt/collects/openssl/pre-installer.ss	2005-10-15 16:56:01.000000000 +0200
@@ -17,7 +17,7 @@
 		   ;; header subdirs
 		   (list "openssl")
 		   ;; unix libs
-		   (list "ssl" "crypto")
+		   (list)
 		   ;; windows libs
 		   (let* ([default-paths
 			    (list (build-path openssl-dir "openssl"))]


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plt-scheme.spec	15 Oct 2005 14:02:32 -0000	1.7
+++ plt-scheme.spec	15 Oct 2005 14:58:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        299.200
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -8,13 +8,14 @@
 URL:            http://www.drscheme.org
 Source:         http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz
 Source1:	drscheme.png
+# this patch disables dependency checking for openssl
+Patch0:		plt-dep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	XFree86-devel, libpng-devel, freetype-devel, fontconfig-devel, libjpeg-devel
 BuildRequires:	zlib-devel, openssl-devel
 BuildRequires:	desktop-file-utils
 Obsoletes:	plt, drscheme
-Provides:	plt-scheme, drscheme, mzscheme, mred, mrflow
-#ExcludeArch:	x86_64
+Provides:	plt, drscheme, mzscheme, mred, mrflow
 
 
 %description
@@ -39,8 +40,11 @@
 drawing toolbox for drawing to windows, bitmaps, and printer devices;
 and an editor toolbox for creating multimedia editors.
 
+
 %prep
 %setup -q -n plt
+%patch0 -p1
+
 
 %build
 cd src
@@ -49,23 +53,24 @@
 sed -i -e "s|fsize = 10|fsize = 12|" wxxt/src/Application/AppMain.cc
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
 pushd src
-make -k install prefix=$RPM_BUILD_ROOT%{_libdir}/plt || true
+make install prefix=$RPM_BUILD_ROOT%{_libdir}/plt
 popd
 
 for i in drscheme framework-test framework-test-engine games gmzc help-desk mzc mzpp mztext pdf-slatex planet setup-plt slatex slideshow swindle tex2page web-server web-server-monitor web-server-text
 do
-    sed -i -e "s|PLTHOME=.*$|PLTHOME=/usr/lib/plt|" $RPM_BUILD_ROOT%{_libdir}/plt/bin/$i
+    sed -i -e "s|PLTHOME=.*$|PLTHOME=%{_libdir}/plt|" $RPM_BUILD_ROOT%{_libdir}/plt/bin/$i
 done
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd $RPM_BUILD_ROOT%{_bindir}
 for i in drscheme mred mzc mzscheme setup-plt
 do
-    ln -sf ../lib/plt/bin/$i .
+    ln -sf ../%{_lib}/plt/bin/$i .
 done
 popd
 
@@ -118,6 +123,12 @@
 
 
 %changelog
+* Thu Oct  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.200-8
+- try x86_64 again using patch for disabling dependency checking for openssl
+
+* Thu Oct  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.200-6
+- use %%{_libdir} and %%{_lib} in creating links
+
 * Wed Aug 17 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.200-4
 - Increase font size from 10 to 12