rpms/gnu-smalltalk/FC-6 gnu-smalltalk.spec, 1.3, 1.4 gst-2.3.2-am.patch, 1.1, 1.2
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Wed Feb 14 16:52:19 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/gnu-smalltalk/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2364
Modified Files:
gnu-smalltalk.spec gst-2.3.2-am.patch
Log Message:
Solve multilib issue
Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gnu-smalltalk.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnu-smalltalk.spec 31 Jan 2007 16:16:45 -0000 1.3
+++ gnu-smalltalk.spec 14 Feb 2007 16:51:46 -0000 1.4
@@ -1,7 +1,7 @@
Summary: GNU Smalltalk
Name: gnu-smalltalk
Version: 2.3.2
-Release: 4%{?dist}
+Release: 6%{?dist}
# Source: smalltalk-2.2b.tar.gz
Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
Patch1: gst-2.3.2-am.patch
@@ -117,7 +117,6 @@
%{_libdir}/libgst.so.*
%{_libdir}/gnu-smalltalk/
-%{_datadir}/gnu-smalltalk/
%{_infodir}/gst.info*
%{_infodir}/gst-*.info*
@@ -134,6 +133,7 @@
%{_libdir}/pkgconfig/gnu-smalltalk.pc
%{_datadir}/aclocal/*.m4
+%{_datadir}/gnu-smalltalk/
%{_includedir}/gst.h
%{_includedir}/gstpub.h
@@ -143,6 +143,12 @@
%{_datadir}/emacs/site-lisp/*
%changelog
+* Tue Feb 13 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-6
+- Solve multilib issue (#228175)
+
+* Sun Feb 11 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-5
+- Rebuild to fix broken deps.
+
* Wed Jan 31 2007 Jochen Schmitt <s4504kr at zeus.herr-schmitt.de> 2.3.2-4
- New upstream release
gst-2.3.2-am.patch:
Index: gst-2.3.2-am.patch
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/FC-6/gst-2.3.2-am.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-2.3.2-am.patch 31 Jan 2007 16:16:45 -0000 1.1
+++ gst-2.3.2-am.patch 14 Feb 2007 16:51:46 -0000 1.2
@@ -1,5 +1,5 @@
--- smalltalk-2.3.2/configure.automake 2007-01-31 10:10:41.000000000 +0100
-+++ smalltalk-2.3.2/configure 2007-01-31 16:22:57.000000000 +0100
++++ smalltalk-2.3.2/configure 2007-02-14 16:51:26.000000000 +0100
@@ -723,7 +723,7 @@
# Identity of this package.
@@ -27,8 +27,8 @@
VERSION='2.3.2'
---- smalltalk-2.3.2/Makefile.in.automake 2007-01-31 10:10:38.000000000 +0100
-+++ smalltalk-2.3.2/Makefile.in 2007-01-31 16:23:00.000000000 +0100
+--- smalltalk-2.3.2/Makefile.in.automake 2007-02-14 16:49:32.000000000 +0100
++++ smalltalk-2.3.2/Makefile.in 2007-02-14 16:51:33.000000000 +0100
@@ -274,7 +274,7 @@
NCURSES_DISABLED = @NCURSES_DISABLED@
OBJDUMP = @OBJDUMP@
@@ -38,8 +38,42 @@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
+@@ -394,6 +394,7 @@
+ #
+ ###########################################################
+ pkgconfigdir = $(libdir)/pkgconfig
++imagedir = ${libdir}/@PACKAGE@
+ nodist_pkgconfig_DATA = gnu-smalltalk.pc
+ pkglib_DATA = libc.la
+ noinst_DATA = gst.im
+@@ -1130,20 +1131,20 @@
+ # Build an image after installing the data; install-data runs after
+ # install-exec, so the gst executable is already in bindir.
+ install-data-hook: gst-package
+- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
++ rm -f $(DESTDIR)$(imagedir)/packages.xml
+ ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml
+ srcdir=`cd $(srcdir) && pwd`; \
+- cd $(DESTDIR)$(pkgdatadir); \
++ cd $(DESTDIR)$(imagedir); \
+ rm -f gst.im; \
+ SMALLTALK_KERNEL="`pwd`/kernel" \
+ SMALLTALK_IMAGE="`pwd`" \
+ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
+- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES)
++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES)
+
+ uninstall-local:: gst-package
+ ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
+- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im
++ -rm -f $(DESTDIR)$(imagedir)/packages.xml
++ -rm -f $(DESTDIR)$(imagedir)/gst.im
+
+ installcheck-local:
+ if test -n "$(DESTDIR)"; then :; else \
--- smalltalk-2.3.2/Makefile.am.automake 2006-12-13 08:58:45.000000000 +0100
-+++ smalltalk-2.3.2/Makefile.am 2007-01-31 16:19:02.000000000 +0100
++++ smalltalk-2.3.2/Makefile.am 2007-02-14 16:49:18.000000000 +0100
@@ -19,7 +19,7 @@
AUTOMAKE_OPTIONS = gnu 1.8
ACLOCAL_AMFLAGS = -I build-aux
@@ -49,8 +83,53 @@
DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
i18n tcp examples blox-tk . gtk tests doc
+@@ -50,6 +50,7 @@
+ ###########################################################
+
+ pkgconfigdir = $(libdir)/pkgconfig
++imagedir = ${libdir}/@PACKAGE@
+ nodist_pkgconfig_DATA = gnu-smalltalk.pc
+
+ pkglib_DATA = libc.la
+@@ -173,20 +174,20 @@
+ # Build an image after installing the data; install-data runs after
+ # install-exec, so the gst executable is already in bindir.
+ install-data-hook: gst-package
+- rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
++ rm -f $(DESTDIR)$(imagedir)/packages.xml
+ ./gst-package --srcdir="$(srcdir)" --no-load --destdir="$(DESTDIR)" packages.xml
+ srcdir=`cd $(srcdir) && pwd`; \
+- cd $(DESTDIR)$(pkgdatadir); \
++ cd $(DESTDIR)$(imagedir); \
+ rm -f gst.im; \
+ SMALLTALK_KERNEL="`pwd`/kernel" \
+ SMALLTALK_IMAGE="`pwd`" \
+ $(DESTDIR)$(bindir)/gst -f $$srcdir/scripts/Finish.st \
+- "$(DESTDIR)$(pkgdatadir)" "$(pkgdatadir)" $(MODULES)
++ "$(DESTDIR)$(imagedir)" "$(imagedir)" $(MODULES)
+
+ uninstall-local:: gst-package
+ ./gst-package --uninstall --destdir="$(DESTDIR)" packages.xml
+- -rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
+- -rm -f $(DESTDIR)$(pkgdatadir)/gst.im
++ -rm -f $(DESTDIR)$(imagedir)/packages.xml
++ -rm -f $(DESTDIR)$(imagedir)/gst.im
+
+ installcheck-local:
+ if test -n "$(DESTDIR)"; then :; else \
+--- smalltalk-2.3.2/gst-package.in.automake 2006-12-06 19:36:01.000000000 +0100
++++ smalltalk-2.3.2/gst-package.in 2007-02-14 16:49:18.000000000 +0100
+@@ -67,7 +67,7 @@
+ set +e
+ }
+
+-IMAGE_PATH=${SMALLTALK_IMAGE:- at datadir@/@PACKAGE@}
++IMAGE_PATH=${SMALLTALK_IMAGE:- at libdir@/@PACKAGE@}
+ (cd $IMAGE_PATH 2> /dev/null && IMAGE_PATH=`pwd`)
+
+ request_help=false
--- smalltalk-2.3.2/configure.ac.automake 2007-01-31 10:10:04.000000000 +0100
-+++ smalltalk-2.3.2/configure.ac 2007-01-31 16:20:14.000000000 +0100
++++ smalltalk-2.3.2/configure.ac 2007-02-14 16:49:18.000000000 +0100
@@ -7,7 +7,7 @@
dnl Process this file with autoconf to produce a configure script.
@@ -60,3 +139,38 @@
MAINTAINER="bonzini at gnu.org"
dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
+--- smalltalk-2.3.2/libgst/Makefile.in.automake 2007-02-14 16:50:04.000000000 +0100
++++ smalltalk-2.3.2/libgst/Makefile.in 2007-02-14 16:51:32.000000000 +0100
+@@ -305,11 +305,12 @@
+ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++imagedir = $(libdir)/@PACKAGE@
+ LEX_OUTPUT_ROOT = lex.yy
+ AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c
+ AM_YFLAGS = -vy
+-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
+- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \
++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \
+ -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
+ -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
+ @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src \
+--- smalltalk-2.3.2/libgst/Makefile.am.automake 2006-02-05 19:41:34.000000000 +0100
++++ smalltalk-2.3.2/libgst/Makefile.am 2007-02-14 16:49:18.000000000 +0100
+@@ -1,11 +1,13 @@
+ LIBTOOL += --tag=LIBGST
+
++imagedir = $(libdir)/@PACKAGE@
++
+ LEX_OUTPUT_ROOT = lex.yy
+ ## CFLAGS=-O0 -g
+ AM_LFLAGS = -Cfe -o$(LEX_OUTPUT_ROOT).c
+ AM_YFLAGS = -vy
+-AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
+- -DIMAGE_PATH=\"$(pkgdatadir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
++AM_CPPFLAGS = -DKERNEL_PATH=\"$(imagedir)/kernel\" \
++ -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(imagedir)\" \
+ -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
+ -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
+ @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
More information about the fedora-extras-commits
mailing list