The package rpms/gauche.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gauche.git/commit/?id=560b947ba56....
Change:
-%ifarch %{ix86}
Thanks.
Full change:
============
commit 560b947ba5684320083b67d80f99f6ca14029c9c
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sun Jul 11 17:46:09 2021 -0700
Update to 0.9.10
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index bdbc7a1..d334974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/Gauche-0.9.5.tgz
-/Gauche-0.9.9.tgz
+/Gauche-*.*.*.tgz
diff --git a/gauche-0.9.10-no_ssltest.patch b/gauche-0.9.10-no_ssltest.patch
new file mode 100644
index 0000000..6a25573
--- /dev/null
+++ b/gauche-0.9.10-no_ssltest.patch
@@ -0,0 +1,17 @@
+--- Gauche-0.9.10/ext/tls/test.scm.no_ssltest 2020-12-11 00:23:43.000000000 -0800
++++ Gauche-0.9.10/ext/tls/test.scm 2021-07-11 16:29:01.197960177 -0700
+@@ -91,14 +91,6 @@
+ (print #"exec \"~|openssl-cmd|\" \"$@\"")])))
+ (sys-chmod "kick_openssl.sh" #o755))
+
+- (test* "ssltest" 0
+- (process-exit-status
+- (run-process `(./ssltest
+- ,@(cond-list [openssl-cmd "--exttest"]))
+- :directory "axTLS/ssl"
+- ;:output "ssltest.log"
+- :wait #t)))
+-
+ ;; On MSYS (mintty), winpty with '-Xallow-non-tty' option changes tty
+ ;; setting, so that we should reset it.
+ (when (and openssl-cmd winpty-needed)
diff --git a/gauche.spec b/gauche.spec
index 2ff080c..3540a6e 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -1,22 +1,31 @@
+%ifarch aarch64
+# ext/termios currently crashing:
+# Testing termios ...
+# *** ERROR: A string containing NUL character is not allowed:
#**"\xb0;\xfd;\xbb;\xa3;\xff;\xff;\0"
+# While loading "././test.scm" at line 162
+%bcond_with tests
+%else
+%bcond_without tests
+%endif
+
Name: gauche
-Version: 0.9.9
-Release: 3%{?dist}
+Version: 0.9.10
+Release: 1%{?dist}
Summary: Scheme script interpreter with multibyte character handling
-%if 0%{?rhel}
-%endif
License: BSD
URL:
http://practical-scheme.net/gauche/index.html
-Source:
http://download.sourceforge.net/gauche/Gauche-%{version}.tgz
+Source0:
http://download.sourceforge.net/gauche/Gauche-%{version}.tgz
+# ssltest fails - returns 256 instead of 0
+Patch0: %{name}-0.9.10-no_ssltest.patch
-%if 0%{?el5}
-%endif
-
-BuildRequires: make
+BuildRequires: make
BuildRequires: gcc
BuildRequires: gdbm-devel
+BuildRequires: mbedtls-devel
BuildRequires: openssl
BuildRequires: texinfo
+BuildRequires: zlib-devel
Requires: slib
%define main_version 0.97
@@ -37,46 +46,55 @@ Development files for Gauche.
%prep
-%setup -q -n Gauche-%{version}
+%autosetup -n Gauche-%{version} -p1
+# correct permissions
+chmod 0644 examples/grep.scm
+# Convert to utf-8
+for file in examples/nqueen.scm; do
+ iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+# remove DOS line endings
+for file in examples/echo-client.scm examples/windows/*.scm; do
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+
%build
%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
--with-slib=%{_datadir}/slib
-LD_LIBRARY_PATH=`pwd`/src make \
-%ifarch %{ix86}
- OPTFLAGS="-fomit-frame-pointer"
-%else
- %{nil}
-%endif
+LD_LIBRARY_PATH=`pwd`/src %make_build
%install
-%if 0%{?el5}
-rm -fr $RPM_BUILD_ROOT
-%endif
-LD_LIBRARY_PATH=`pwd`/src make DESTDIR=$RPM_BUILD_ROOT install-pkg
-LD_LIBRARY_PATH=`pwd`/src make DESTDIR=$RPM_BUILD_ROOT install-doc
+LD_LIBRARY_PATH=`pwd`/src %make_install
# correct permissions
-chmod -R u+w $RPM_BUILD_ROOT
-chmod 0644 examples/grep.scm
-chmod 0644 ext/template.*
+chmod -R u+w %{buildroot}
# remove static lib
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgauche-static-%{main_version}.a
+rm -f %{buildroot}%{_libdir}/libgauche-static-%{main_version}.a \
+
%{buildroot}%{_libdir}/gauche-%{main_version}/%{version}/*/libgauche-static-%{main_version}.a
# remove japanese doc
-rm -f $RPM_BUILD_ROOT%{_infodir}/gauche-refj.*
-
-# this things go into the doc of the devel package
-rm -f $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/template*
-rm -f $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/aclocal*
+rm -f %{buildroot}%{_infodir}/gauche-refj.*
# make .c files readable for debuginfo
find -name '*.c' | xargs chmod 0644
+# fix non-executable scripts
+for p in lib/rfc/tls/get-cacert.scm package-templates/configure; do
+ chmod +x %{buildroot}%{_datadir}/gauche-%{main_version}/%{version}/$p
+done
+
+%if %{with tests}
%check
-cd src; LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make test
+LD_LIBRARY_PATH=`pwd`/src make check
+%endif
+
%post
# creates slib catalog, if possible.
@@ -85,7 +103,7 @@ cd src; LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make test
%files
%license COPYING
-%doc ChangeLog AUTHORS VERSION examples
+%doc ChangeLog AUTHORS README.adoc VERSION examples
%{_bindir}/gauche-cesconv
%{_bindir}/gauche-install
%{_bindir}/gauche-package
@@ -98,22 +116,27 @@ cd src; LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make test
%{_mandir}/man*/gauche-install.*
%{_mandir}/man*/gauche-package.*
%{_datadir}/gauche-%{main_version}
-%exclude %{_datadir}/gauche-%{main_version}/%{version}/template*
%exclude %{_libdir}/gauche-%{main_version}/%{version}/include
+%exclude %{_libdir}/gauche-%{main_version}/%{version}/*/libgauche-%{main_version}.so
+%exclude %{_datadir}/gauche-%{main_version}/%{version}/package-templates
%ghost %{_datadir}/gauche-%{main_version}/%{version}/lib/slibcat
%files devel
-%doc ext/template.*
+%doc HACKING.adoc
%{_bindir}/gauche-config
%{_libdir}/libgauche-%{main_version}.so
%{_libdir}/gauche-%{main_version}/%{version}/include
-%{_datadir}/gauche-%{main_version}/%{version}/template*
+%{_libdir}/gauche-%{main_version}/%{version}/*/libgauche-%{main_version}.so
+%{_datadir}/gauche-%{main_version}/%{version}/package-templates
%{_datadir}/aclocal/gauche.m4
%{_mandir}/man*/gauche-config*
%changelog
+* Sat Jul 10 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.9.10-1
+- Update to 0.9.10
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.9-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 32b0b12..5f73ab6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Gauche-0.9.9.tgz) =
ff6fdc80bd14c4a5dc57b5a6ac9558078a557cd30c2efe98146c3817a7830ef2b3f5bb6184ce6b8ac9b1b9cb636f041643fa761b2f99e6dd0602e13e7928e210
+SHA512 (Gauche-0.9.10.tgz) =
f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
commit 780d09ade4a450f2202ee72cc58e0fabb08b8f7b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 06:22:06 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/gauche.spec b/gauche.spec
index a51d32f..2ff080c 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -1,6 +1,6 @@
Name: gauche
Version: 0.9.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Scheme script interpreter with multibyte character handling
%if 0%{?rhel}
@@ -114,6 +114,9 @@ cd src; LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make test
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.9-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.9-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit b6f5fc3415f6295782af361709bdaba949d2ec0f
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Tue Jan 12 06:06:36 2021 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/gauche.spec b/gauche.spec
index f27738b..a51d32f 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -12,6 +12,7 @@ Source:
http://download.sourceforge.net/gauche/Gauche-%{version}.tgz
%if 0%{?el5}
%endif
+BuildRequires: make
BuildRequires: gcc
BuildRequires: gdbm-devel
BuildRequires: openssl