rpms/gnu-smalltalk/devel gst-2.3.6-multilib.patch, NONE, 1.1 gnu-smalltalk.spec, 1.25, 1.26
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Thu Oct 25 18:14:50 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4967
Modified Files:
gnu-smalltalk.spec
Added Files:
gst-2.3.6-multilib.patch
Log Message:
Add upstream patch to solve multilib issue
gst-2.3.6-multilib.patch:
--- NEW FILE gst-2.3.6-multilib.patch ---
diff -up smalltalk-2.3.6/examples/Publish.st.org smalltalk-2.3.6/examples/Publish.st
--- smalltalk-2.3.6/examples/Publish.st.org 2007-09-06 09:30:17.000000000 +0200
+++ smalltalk-2.3.6/examples/Publish.st 2007-10-25 19:49:54.000000000 +0200
@@ -34,6 +34,17 @@ Namespace current: ClassPublisher!
!String methodsFor: 'useful functionality'!
+caseSensitiveCompareTo: aCharacterArray
+ | c1 c2 |
+ 1 to: (self size min: aCharacterArray size)
+ do:
+ [:i |
+ c1 := (self at: i) value.
+ c2 := (aCharacterArray at: i) value.
+ c1 = c2 ifFalse: [^c1 - c2]].
+ ^self size - aCharacterArray size
+ !
+
linesDo: aBlock
"Send 'aBlock' a substring of the receiver for each newline delimited
line in the receiver"
@@ -648,7 +659,8 @@ emitCategory: category
categoryMethods add: assoc key -> assoc value methodSourceString
]
].
- categoryMethods := categoryMethods asSortedCollection.
+ categoryMethods := categoryMethods asSortedCollection: [ :a :b |
+ (a key caseSensitiveCompareTo: b key) <= 0 ].
categories add: (category, kind) -> categoryMethods.
self emitLink: category kind: kind
diff -up smalltalk-2.3.6/doc/Makefile.in.org smalltalk-2.3.6/doc/Makefile.in
--- smalltalk-2.3.6/doc/Makefile.in.org 2007-10-25 19:54:54.000000000 +0200
+++ smalltalk-2.3.6/doc/Makefile.in 2007-10-25 19:57:29.000000000 +0200
@@ -703,6 +703,7 @@ uninstall-man: uninstall-man1
$(srcdir)/gst.1: $(top_srcdir)/libgst/lib.c $(top_srcdir)/configure.ac
$(HELP2MAN) --info-page gst \
--name "the GNU Smalltalk virtual machine" $(top_builddir)/gst >$@
+ $(SED) -i '/^@..index/ s/:/_/g' $@
$(srcdir)/blox.texi: $(top_srcdir)/blox-tk/stamp-classes
rm -f $(srcdir)/blox.texi
@@ -711,6 +712,7 @@ $(srcdir)/blox.texi: $(top_srcdir)/blox-
$$gst -I $$gst_im -f ../scripts/GenLibDoc.st \
BLOX BloxTK blox.texi Blox.st
test -f $(srcdir)/blox.texi && touch $(srcdir)/gst-libs.texi
+ $(SED) -i '/^@..index/ s/:/_/g' $@
$(srcdir)/tcp.texi: $(top_srcdir)/tcp/stamp-classes
rm -f $(srcdir)/tcp.texi
@@ -719,6 +721,8 @@ $(srcdir)/tcp.texi: $(top_srcdir)/tcp/st
$$gst -I $$gst_im -f ../scripts/GenLibDoc.st \
TCP TCP tcp.texi TCP.st
test -f $(srcdir)/tcp.texi && touch $(srcdir)/gst-libs.texi
+ $(SED) -i '/^@..index/ s/:/_/g' $@
+
$(srcdir)/i18n.texi: $(top_srcdir)/i18n/stamp-classes
rm -f $(srcdir)/i18n.texi
@@ -727,6 +731,7 @@ $(srcdir)/i18n.texi: $(top_srcdir)/i18n/
$$gst -I $$gst_im -f ../scripts/GenLibDoc.st \
I18N I18N i18n.texi Load.st Collation.st
test -f $(srcdir)/i18n.texi && touch $(srcdir)/gst-libs.texi
+ $(SED) -i '/^@..index/ s/:/_/g' $@
$(srcdir)/regex.texi: $(top_srcdir)/examples/regex.st
rm -f $(srcdir)/regex.texi
@@ -735,6 +740,7 @@ $(srcdir)/regex.texi: $(top_srcdir)/exam
$$gst -I $$gst_im -f ../scripts/GenLibDoc.st \
Regex Regex regex.texi
test -f $(srcdir)/regex.texi && touch $(srcdir)/gst-libs.texi
+ $(SED) -i '/^@..index/ s/:/_/g' $@
$(srcdir)/classes.texi: $(top_srcdir)/kernel/stamp-classes
rm -f $(srcdir)/classes.texi
@@ -743,18 +749,7 @@ $(srcdir)/classes.texi: $(top_srcdir)/ke
$$gst -I $$gst_im -f ../scripts/GenBaseDoc.st \
$(PUBLISHED_NAMESPACES)
test -f $(srcdir)/classes.texi && touch $(srcdir)/gst-base.texi
-
-# In TeX output, having colons in index entries looks pretty, but
-# this is impossible in info output!!! So we hack by replacing
-# colons with underscores in the info file.
-.texi.info:
- @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- fixed=`pwd`/`echo $< | $(SED) 's/\.texi/-fixed&/' `; \
- cd $(srcdir) && \
- $(MAKEINFO) `echo $< | $(SED) 's,.*/,,'` -E - -o /dev/null | \
- $(SED) '/^@..index/ s/:/_/g' > $$fixed && \
- $(MAKEINFO) $$fixed > /dev/null 2>&1 && \
- rm -f $$fixed
+ $(SED) -i '/^@..index/ s/:/_/g' $@
####################################################
####################################################
diff -up smalltalk-2.3.6/doc/gst.texi.org smalltalk-2.3.6/doc/gst.texi
--- smalltalk-2.3.6/doc/gst.texi.org 2007-06-01 17:13:48.000000000 +0200
+++ smalltalk-2.3.6/doc/gst.texi 2007-10-25 19:49:54.000000000 +0200
@@ -1509,7 +1509,7 @@ The @code{DLD} class enhances the C call
for unresolved functions in a series of program-specified libraries. To
add a library to the list, evaluate code like the following:
@example
- DLD addLibrary: '/usr/lib/libc'
+ DLD addLibrary: 'libc'
@end example
The extension (@file{.so}, @file{.sl}, @file{.a}, @file{.dll} depending
Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnu-smalltalk.spec 24 Oct 2007 18:50:54 -0000 1.25
+++ gnu-smalltalk.spec 25 Oct 2007 18:14:17 -0000 1.26
@@ -1,10 +1,11 @@
Summary: GNU Smalltalk
Name: gnu-smalltalk
Version: 2.3.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
Patch1: gst-2.3.6-am.patch
Patch2: gst-2.3.6-pathfix.patch
+Patch3: gst-2.3.6-multilib.patch
License: GPLv2
Group: Development/Languages
URL: http://www.gnu.org/software/smalltalk/smalltalk.html
@@ -66,7 +67,8 @@
%prep
%setup -q -n smalltalk-%{version}
%patch1 -p1
-%patch2 -p1 -b .pfx
+%patch2 -p1
+%patch3 -p1 -b .org
%build
# automake
@@ -82,7 +84,8 @@
cd doc
for i in gst*; do
- sed -e 's!%{_libdir}!/usr/lib(64)/!'g \
+ sed -e 's!%{_libdir}!/usr/lib(64)!g' \
+ -e 's!/usr/lib!/usr/lib(64)!g' \
-e 's!/usr/share/gnu-smalltalk/kernel!/usr/lib(64)/gnu-smalltalk/kernel!g' \
$i >$i.new
mv -f $i.new $i
@@ -157,6 +160,9 @@
%{_datadir}/emacs/site-lisp/*
%changelog
+* Thu Oct 25 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3-4-5
+- Add upstream multilib patch
+
* Wed Oct 24 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-4
- Another try to fix the multilib issue
More information about the fedora-extras-commits
mailing list