commit 7fc444f059d7f0a181cd9bb773771712f5a60742
Author: Jakub Bogusz <[email protected]>
Date: Sat Feb 11 18:11:51 2023 +0100
- cleanups, updated dependencies, added info patch (unify direntry);
release 12
smalltalk-info.patch | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
smalltalk.spec | 59 +++++++++++++++++++++++++++++-----------------------
2 files changed, 88 insertions(+), 26 deletions(-)
---
diff --git a/smalltalk.spec b/smalltalk.spec
index a92f6fd..6135880 100644
--- a/smalltalk.spec
+++ b/smalltalk.spec
@@ -1,38 +1,36 @@
-#
# TODO
-# - failure on athlon arch:
-# ./gst-tool gst-package
--kernel-dir="/home/users/builder/rpm/BUILD/smalltalk-3.1/kernel"
--image="/home/users/builder/rpm/BUILD/smalltalk-3.1/gst.im" --srcdir=.
--target-directory=. packages/blox/tk/package.xml
-# Illegal instruction
# - package emacs stuff
#
Summary: GNU smalltalk
Summary(pl.UTF-8): GNU smalltalk
Name: smalltalk
Version: 3.2.5
-Release: 11
-License: GPL
+Release: 12
+License: GPL v2+
Group: Development/Languages
-Source0: ftp://ftp.gnu.org/pub/gnu/smalltalk/%{name}-%{version}.tar.xz
+Source0: https://ftp.gnu.org/gnu/smalltalk/%{name}-%{version}.tar.xz
# Source0-md5: 772d2ac09f96dda203d49f0b80bc58f3
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-proc.patch
-URL: http://smalltalk.gnu.org/
+Patch1: %{name}-info.patch
+URL: http://www.gnu.org/software/smalltalk/
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-glut-devel
-BuildRequires: SDL-devel
+BuildRequires: SDL-devel >= 1.2
BuildRequires: atk-devel >= 1.0.0
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
-BuildRequires: expat-devel
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
+BuildRequires: expat-devel >= 1.95
BuildRequires: gawk
BuildRequires: gdbm-devel
BuildRequires: glib2-devel >= 2.0.0
+BuildRequires: gmp-devel
BuildRequires: gnutls-devel
BuildRequires: gtk+2-devel >= 1:2.0.0
BuildRequires: libffi-devel
BuildRequires: libltdl-devel
-BuildRequires: libsigsegv
+BuildRequires: libsigsegv-devel
BuildRequires: libtool >= 2:1.5
BuildRequires: ncurses-devel >= 5.0
BuildRequires: pango-devel >= 1:1.0.0
@@ -40,8 +38,10 @@ BuildRequires: pkgconfig
BuildRequires: readline-devel >= 4.2
BuildRequires: sqlite3-devel
BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: tcl-devel >= 8.4
BuildRequires: texinfo
BuildRequires: tk-devel >= 8.4
+BuildRequires: zlib-devel
Requires(post,postun): /sbin/ldconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,6 +70,9 @@ Summary(pl.UTF-8): Pliki nagłówkowe dla GNU SmallTalka
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gmp-devel
+Requires: libffi-devel
+Requires: libltdl-devel
+Requires: libsigsegv-devel
Requires: readline-devel
%description devel
@@ -177,18 +180,19 @@ Moduł OpenGL dla GNU Smalltalka.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure \
+ AWK=gawk \
CPPFLAGS="-DUSE_INTERP_RESULT %{rpmcppflags}" \
- --with-imagedir=/var/lib/smalltalk \
- --enable-gtk=yes \
--enable-disassembler \
+ --enable-gtk \
--enable-preemption \
+ --with-imagedir=/var/lib/smalltalk \
--with-system-libffi \
--with-system-libsigsegv \
- --without-emacs \
- AWK=gawk
+ --without-emacs
# gtk things are generated improperly when some locale are set
%{__make} \
@@ -204,13 +208,11 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
ln -sf ../../bin/gst $RPM_BUILD_ROOT%{_datadir}/smalltalk/gst
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
# no static modules (*.la used by ltdl)
-rm -f $RPM_BUILD_ROOT%{_libdir}/smalltalk/*.a
-# doesn't belong here
-rm -rf $RPM_BUILD_ROOT{%{_aclocaldir}/snprintfv.m4,%{_includedir}/snprintfv}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/smalltalk/*.a
%clean
rm -rf $RPM_BUILD_ROOT
@@ -248,12 +250,18 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/smalltalk/iconv.la
%attr(755,root,root) %{_libdir}/smalltalk/zlib*.so
%{_libdir}/smalltalk/zlib.la
+%if "%{_libexecdir}" != "%{_libdir}"
%dir %{_libexecdir}/smalltalk
+%endif
%attr(755,root,root) %{_libexecdir}/smalltalk/gnutls-wrapper
%dir %{_libexecdir}/smalltalk/vfs
%attr(755,root,root) %{_libexecdir}/smalltalk/vfs/*
%{_datadir}/smalltalk
-%{_infodir}/gst*
+%{_desktopdir}/smalltalk.desktop
+%{_pixmapsdir}/smalltalk.png
+%{_infodir}/gst.info*
+%{_infodir}/gst-base.info*
+%{_infodir}/gst-libs.info*
%{_mandir}/man1/gst.1*
%{_mandir}/man1/gst-convert.1*
%{_mandir}/man1/gst-doc.1*
@@ -261,8 +269,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/gst-profile.1*
%{_mandir}/man1/gst-reload.1*
%{_mandir}/man1/gst-sunit.1*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
%dir /var/lib/smalltalk
/var/lib/smalltalk/gst.im
@@ -272,7 +278,8 @@ rm -rf $RPM_BUILD_ROOT
%attr (755,root,root) %{_bindir}/gst-package
%attr(755,root,root) %{_libdir}/libgst.so
%{_libdir}/libgst.la
-%{_includedir}/*.h
+%{_includedir}/gst.h
+%{_includedir}/gstpub.h
%{_aclocaldir}/gst.m4
%{_aclocaldir}/gst-package.m4
%{_pkgconfigdir}/gnu-smalltalk.pc
diff --git a/smalltalk-info.patch b/smalltalk-info.patch
new file mode 100644
index 0000000..fc33939
--- /dev/null
+++ b/smalltalk-info.patch
@@ -0,0 +1,55 @@
+Unify @direntries to PLD format
+Fix/workaround @item vs @itemx error reported by texinfo 7
+--- smalltalk-3.2.5/doc/gst.texi.orig 2013-03-23 20:56:26.000000000 +0100
++++ smalltalk-3.2.5/doc/gst.texi 2023-02-11 17:04:11.889969596 +0100
+@@ -57,9 +57,9 @@
+ @sc{gnu}
+ @end macro
+
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* Smalltalk: (gst). The @gst{} user's guide.
++* Smalltalk: (gst). The @gst{} user's guide
+ @end direntry
+
+ @copying
+--- smalltalk-3.2.5/doc/gst-base.texi.orig 2013-04-08 07:55:08.000000000
+0200
++++ smalltalk-3.2.5/doc/gst-base.texi 2023-02-11 17:04:59.229713135 +0100
+@@ -33,9 +33,9 @@
+ @sc{gnu}
+ @end macro
+
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* Smalltalk base classes: (gst-base). The GNU Smalltalk base classes.
++* Smalltalk base classes: (gst-base). The GNU Smalltalk base classes
+ @end direntry
+
+ @copying
+--- smalltalk-3.2.5/doc/gst-libs.texi.orig 2023-02-11 16:42:01.393844178
+0100
++++ smalltalk-3.2.5/doc/gst-libs.texi 2023-02-11 17:05:16.806284581 +0100
+@@ -33,9 +33,9 @@
+ @sc{gnu}
+ @end macro
+
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* Smalltalk libraries: (gst-libs). The GNU Smalltalk class libraries.
++* Smalltalk libraries: (gst-libs). The GNU Smalltalk class libraries
+ @end direntry
+
+ @copying
+--- smalltalk-3.2.5/doc/tutorial.texi.orig 2013-03-23 20:56:26.000000000
+0100
++++ smalltalk-3.2.5/doc/tutorial.texi 2023-02-11 17:23:57.730212016 +0100
+@@ -3920,7 +3920,7 @@ and keyword selectors:
+ #at:put:
+ @end example
+
+-@itemx @t{eval: ``##('' [temps] exprs ``)''}
++@item @t{eval: ``##('' [temps] exprs ``)''}
+ This syntax also has not been used in the tutorial, and results
+ in evaluating an arbitrarily complex expression at compile-time,
+ and substituting the result: for example @code{##(Object allInstances
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/smalltalk.git/commitdiff/7fc444f059d7f0a181cd9bb773771712f5a60742
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
