[gnu-smalltalk] Remove obsolete RPM statements User emacs-nox instead of emacs as a BR Add patch to solve issue with
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Apr 9 07:49:57 UTC 2013
commit 056ae9cb618cb50da840ba595ade75621169a11c
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Tue Apr 9 09:48:23 2013 +0200
Remove obsolete RPM statements
User emacs-nox instead of emacs as a BR
Add patch to solve issue with tutorial.texi
gnu-smalltalk.spec | 18 ++++++++----------
gst-3.2.5-inf.patch | 12 ++++++++++++
2 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/gnu-smalltalk.spec b/gnu-smalltalk.spec
index c1c1f4a..59dbc6e 100644
--- a/gnu-smalltalk.spec
+++ b/gnu-smalltalk.spec
@@ -9,13 +9,12 @@ Source2: gnu-smalltalk.svg
Patch1: gst-3.2.5-am.patch
Patch2: gst-3.2.3-ltdl.patch
+Patch3: gst-3.2.5-inf.patch
License: GPLv2+ with exceptions
Group: Development/Languages
URL: http://www.gnu.org/software/smalltalk/smalltalk.html
-Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-
ExcludeArch: ppc64 ppc
Requires(post): /sbin/install-info
@@ -23,11 +22,11 @@ Requires(preun): /sbin/install-info
BuildRequires: prelink
BuildRequires: tk-devel
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
BuildRequires: gdbm-devel
BuildRequires: gmp-devel
BuildRequires: readline-devel
-BuildRequires: emacs
+BuildRequires: emacs-nox
BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
BuildRequires: texinfo
@@ -97,10 +96,11 @@ with functions written in C.
%setup -q -n smalltalk-%{version}
%patch1 -p1 -b .auto
%patch2 -p1 -b .ltdl
+%patch3 -p1 -b .inf
%build
libtoolize
-autoreconf
+autoreconf --force --install
rm -rf lib-src/lt*
CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack"
%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} \
@@ -126,8 +126,6 @@ for i in gst*; do
done
%install
-rm -rf $RPM_BUILD_ROOT
-
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -c -p" install
mkdir -p ${RPM_BUILD_ROOT}%{_emacs_sitestartdir}
@@ -159,9 +157,6 @@ desktop-file-install \
%check
make check
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
/sbin/install-info %{_infodir}/gst.info %{_infodir}/dir || :
/sbin/install-info %{_infodir}/gst-base.info %{_infodir}/dir || :
@@ -236,6 +231,9 @@ fi
* Mon Apr 8 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.2.5-1
- New upstream release
- Reformating changelog entries
+- Remove obsolete RPM statements
+- User emacs-nox insteadof emacs for a BR
+- Add Patch to fix issue in tutorial.texi
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.4-4.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/gst-3.2.5-inf.patch b/gst-3.2.5-inf.patch
new file mode 100644
index 0000000..ecb6c14
--- /dev/null
+++ b/gst-3.2.5-inf.patch
@@ -0,0 +1,12 @@
+diff -up smalltalk-3.2.5/doc/tutorial.texi.inf smalltalk-3.2.5/doc/tutorial.texi
+--- smalltalk-3.2.5/doc/tutorial.texi.inf 2013-04-09 09:26:01.140329500 +0200
++++ smalltalk-3.2.5/doc/tutorial.texi 2013-04-09 09:26:27.171632963 +0200
+@@ -3920,7 +3920,7 @@ and keyword selectors:
+ #at:put:
+ @end example
+
+- at itemx @t{eval: ``##('' [temps] exprs ``)''}
++ at 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
More information about the scm-commits
mailing list