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=44d9d4ee582....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 7fd724cf48feb84931568ad7c3dfc3272beaa0c7
Merge: b563a38 090c7be
Author: Ali Erdinc Koroglu <ali.erdinc.koroglu(a)intel.com>
Date: Mon May 2 18:21:03 2022 +0000
Merge #1 `rhbz#2044282`
commit 090c7be361a53344bb06b48d604f3153f7dd08af
Author: aekoroglu <ali.erdinc.koroglu(a)intel.com>
Date: Mon May 2 19:11:58 2022 +0300
missing LD_LIB_PATH added
diff --git a/gauche.spec b/gauche.spec
index 59ec6ad..4d25756 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -96,7 +96,7 @@ find -name '*.c' | xargs chmod 0644
%if %{with tests}
%check
-make check
+LD_LIBRARY_PATH=`pwd`/src make check
%endif
commit e14e33b3706007f2e1bcda9e80dbbbcef61cab76
Author: aekoroglu <ali.erdinc.koroglu(a)intel.com>
Date: Mon May 2 18:31:22 2022 +0300
missing LD_LIB_PATH added
diff --git a/gauche.spec b/gauche.spec
index 5ff42df..59ec6ad 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -81,11 +81,11 @@ This package contains info documents of the reference manual of
Gauche
%build
%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
--with-slib=%{_datadir}/slib --enable-ipv6
-%make_build
+LD_LIBRARY_PATH=`pwd`/src %make_build
%install
-%make_install
+LD_LIBRARY_PATH=`pwd`/src %make_install
# correct permissions
chmod -R u+w %{buildroot}
commit 44d9d4ee58228d5656a5a7c15af2bdab5e87dc6d
Author: aekoroglu <ali.erdinc.koroglu(a)intel.com>
Date: Mon May 2 18:20:36 2022 +0300
armv7hl excluded due to qemu compilation issue
diff --git a/gauche.spec b/gauche.spec
index a46b5f9..5ff42df 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -12,7 +12,7 @@
Name: gauche
Version: 0.9.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Scheme script interpreter with multibyte character handling
License: BSD
@@ -33,6 +33,8 @@ BuildRequires: openssl
BuildRequires: texinfo
BuildRequires: zlib-devel
+ExcludeArch: armv7hl
+
%description
Gauche is a Scheme interpreter conforming Revised^5 Report on
@@ -79,11 +81,11 @@ This package contains info documents of the reference manual of
Gauche
%build
%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
--with-slib=%{_datadir}/slib --enable-ipv6
-LD_LIBRARY_PATH=`pwd`/src %make_build
+%make_build
%install
-LD_LIBRARY_PATH=`pwd`/src %make_install
+%make_install
# correct permissions
chmod -R u+w %{buildroot}
@@ -94,7 +96,7 @@ find -name '*.c' | xargs chmod 0644
%if %{with tests}
%check
-LD_LIBRARY_PATH=`pwd`/src make check
+make check
%endif
@@ -163,8 +165,11 @@ LD_LIBRARY_PATH=`pwd`/src make check
%changelog
+* Mon May 2 2022 Ali Erdinc Koroglu <aekoroglu(a)fedoraproject.org> - 0.9.11-2
+- armv7hl excluded due to qemu compilation issue (rhbz#2044282)
+
* Tue Mar 29 2022 Ali Erdinc Koroglu <aekoroglu(a)fedoraproject.org> - 0.9.11-1
-- Update to 0.9.11 (rhbz#2044282) and IPV6 option enabled
+- Update to 0.9.11 and IPv6 option enabled
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.10-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit b9591e00942da8544a8c4d26371762c060fb5388
Author: aekoroglu <ali.erdinc.koroglu(a)intel.com>
Date: Tue Mar 29 20:12:48 2022 +0300
spec file corrections
diff --git a/gauche.spec b/gauche.spec
index bd9ec58..a46b5f9 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -22,7 +22,6 @@ Patch0: %{name}-0.9.10-no_ssltest.patch
Patch1: %{name}-ext-ldflags.patch
Patch2: %{name}-xz-info.patch
-
Requires: lib%{name}%{?_isa} = %{version}-%{release}
Requires: slib
@@ -76,20 +75,6 @@ This package contains info documents of the reference manual of Gauche
%prep
%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
@@ -140,16 +125,6 @@ LD_LIBRARY_PATH=`pwd`/src make check
%exclude %{_libdir}/libgauche-static-%{abi_version}.a
-%files -n lib%{name}
-%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-%{abi_version}.so*
-%{_libdir}/libgauche-%{abi_version}.so.*
-
-
-%files -n lib%{name}-static
-%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-static-%{abi_version}.a
-%{_libdir}/libgauche-static-%{abi_version}.a
-
-
%files devel
%doc HACKING.adoc
%{_bindir}/gauche-config
@@ -174,6 +149,19 @@ LD_LIBRARY_PATH=`pwd`/src make check
%{_infodir}/gauche-*
+%files -n lib%{name}
+%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-%{abi_version}.so*
+%{_libdir}/libgauche-%{abi_version}.so.*
+
+
+%files -n lib%{name}-static
+%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-static-%{abi_version}.a
+%{_libdir}/libgauche-static-%{abi_version}.a
+
+
+%ldconfig_scriptlets -n lib%{name}
+
+
%changelog
* Tue Mar 29 2022 Ali Erdinc Koroglu <aekoroglu(a)fedoraproject.org> - 0.9.11-1
- Update to 0.9.11 (rhbz#2044282) and IPV6 option enabled
commit c010a0cf8b139eb213fea82d29cb9933e47a73d7
Author: aekoroglu <ali.erdinc.koroglu(a)intel.com>
Date: Tue Mar 29 17:42:51 2022 +0300
update to 9.11
diff --git a/.gitignore b/.gitignore
index d334974..a57c648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Gauche-*.*.*.tgz
+/Gauche-0.9.11.tgz
diff --git a/gauche-ext-ldflags.patch b/gauche-ext-ldflags.patch
new file mode 100644
index 0000000..a5a2153
--- /dev/null
+++ b/gauche-ext-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/ext/Makefile.ext.in
++++ b/ext/Makefile.ext.in
+@@ -22,7 +22,7 @@
+ LIBS = $(XLIBS) @LIBS@
+ CFLAGS = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
+ CPPFLAGS = @CPPFLAGS@ $(XCPPFLAGS)
+-LDFLAGS = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
++LDFLAGS = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
+ BUILD_GOSH_FLAGS =
+
+ # These are set by configure
diff --git a/gauche-xz-info.patch b/gauche-xz-info.patch
new file mode 100644
index 0000000..5ca77a8
--- /dev/null
+++ b/gauche-xz-info.patch
@@ -0,0 +1,31 @@
+--- a/lib/gauche/interactive/info.scm
++++ b/lib/gauche/interactive/info.scm
+@@ -113,7 +113,8 @@
+ :paths (get-info-paths)
+ :pred (^p (or (file-is-readable? p)
+ (file-is-readable? #"~|p|.gz")
+- (file-is-readable? #"~|p|.bz2")))))
++ (file-is-readable? #"~|p|.bz2")
++ (file-is-readable? #"~|p|.xz")))))
+
+ (define (handle-ambiguous-name entry-name)
+ (let* ([keys (map x->string (hash-table-keys (~ (get-info)'index)))]
+--- a/lib/text/info.scm
++++ b/lib/text/info.scm
+@@ -67,6 +67,7 @@
+
+ ;; Find bzip2 location
+ (define bzip2 (find-file-in-paths "bzip2"))
++(define xz (find-file-in-paths "xz"))
+
+ (cond-expand
+ [gauche.sys.zlib]
+@@ -90,6 +91,8 @@
+ (with-input-from-process #"~gzip -c -d ~|file|.gz" thunk)])]
+ [(and bzip2 (file-exists? #"~|file|.bz2"))
+ (with-input-from-process #"~bzip2 -c -d ~|file|.bz2" thunk)]
++ [(and xz (file-exists? #"~|file|.xz"))
++ (with-input-from-process #"~xz -c -d ~|file|.xz" thunk)]
+ [else (error "can't find info file" file)]))
+ (with-input-from-info
+ (^[]
diff --git a/gauche.spec b/gauche.spec
index bfe0c74..bd9ec58 100644
--- a/gauche.spec
+++ b/gauche.spec
@@ -8,16 +8,23 @@
%bcond_without tests
%endif
+%define abi_version 0.98
+
Name: gauche
-Version: 0.9.10
-Release: 3%{?dist}
+Version: 0.9.11
+Release: 1%{?dist}
Summary: Scheme script interpreter with multibyte character handling
License: BSD
-URL:
http://practical-scheme.net/gauche/index.html
-Source0:
http://download.sourceforge.net/gauche/Gauche-%{version}.tgz
-# ssltest fails - returns 256 instead of 0
-Patch0: %{name}-0.9.10-no_ssltest.patch
+URL:
http://practical-scheme.net/gauche
+Source0:
https://github.com/shirok/Gauche/releases/download/release0_9_11/Gauche-%...
+Patch0: %{name}-0.9.10-no_ssltest.patch
+Patch1: %{name}-ext-ldflags.patch
+Patch2: %{name}-xz-info.patch
+
+
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: slib
BuildRequires: make
BuildRequires: gcc
@@ -26,23 +33,45 @@ BuildRequires: mbedtls-devel
BuildRequires: openssl
BuildRequires: texinfo
BuildRequires: zlib-devel
-Requires: slib
-%define main_version 0.97
%description
Gauche is a Scheme interpreter conforming Revised^5 Report on
-Algorithmic Language Scheme. It is designed for rapid development of
-daily tools like system management and text processing. It can handle
+Algorithmic Language Scheme. It is designed for rapid development of
+daily tools like system management and text processing. It can handle
multibyte character strings natively.
+%package -n lib%{name}
+Summary: Gauche runtime shared library
+
+%description -n lib%{name}
+This package contains Gauche runtime shared library
+
+
+%package -n lib%{name}-static
+Summary: Statically linked library for Gauce
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
+
+%description -n lib%{name}-static
+This package contains statically linked library for Gauce.
+Most users should *not* install this.
+
+
%package devel
Summary: Development files for Gauche
-Requires: %{name} = %{version}-%{release}
+Requires: lib%{name}%{?_isa} = %{version}-%{release}
%description devel
-Development files for Gauche.
+This package contains development files for Gauche.
+
+
+%package doc
+Summary: Documentation files for Gauche
+
+%description doc
+This package contains info documents of the reference manual of Gauche
+(English, Japanese).
%prep
@@ -64,7 +93,7 @@ done
%build
-%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
--with-slib=%{_datadir}/slib
+%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
--with-slib=%{_datadir}/slib --enable-ipv6
LD_LIBRARY_PATH=`pwd`/src %make_build
@@ -74,21 +103,9 @@ LD_LIBRARY_PATH=`pwd`/src %make_install
# correct permissions
chmod -R u+w %{buildroot}
-# remove static lib
-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 %{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
@@ -103,37 +120,64 @@ LD_LIBRARY_PATH=`pwd`/src make check
%files
%license COPYING
-%doc ChangeLog AUTHORS README.adoc VERSION examples
+%doc ChangeLog AUTHORS README.adoc VERSION
%{_bindir}/gauche-cesconv
-%{_bindir}/gauche-install
-%{_bindir}/gauche-package
%{_bindir}/gosh
-%{_libdir}/libgauche-%{main_version}.so.*
-%{_libdir}/gauche-%{main_version}
-%{_infodir}/*
-%{_mandir}/man*/gosh.*
+%{_datadir}/gauche-%{abi_version}
+%{_libdir}/gauche-%{abi_version}
%{_mandir}/man*/gauche-cesconv.*
-%{_mandir}/man*/gauche-install.*
-%{_mandir}/man*/gauche-package.*
-%{_datadir}/gauche-%{main_version}
-%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
+%{_mandir}/man*/gosh.*
+%exclude %{_libdir}/gauche-%{abi_version}/%{version}/include
+%exclude %{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-%{abi_version}.so*
+%exclude %{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-static-%{abi_version}.a
+%exclude %{_datadir}/gauche-%{abi_version}/%{version}/aclocal.m4
+%exclude %{_datadir}/gauche-%{abi_version}/%{version}/lib/build-standalone
+%exclude %{_datadir}/gauche-%{abi_version}/%{version}/lib/gencomp
+%exclude %{_datadir}/gauche-%{abi_version}/%{version}/lib/genstub
+%exclude %{_datadir}/gauche-%{abi_version}/%{version}/lib/precomp
+%exclude %{_datadir}/gauche-%{abi_version}/%{version}/package-templates
+%exclude %{_libdir}/libgauche-%{abi_version}.so.*
+%exclude %{_libdir}/libgauche-static-%{abi_version}.a
+
+
+%files -n lib%{name}
+%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-%{abi_version}.so*
+%{_libdir}/libgauche-%{abi_version}.so.*
+
+
+%files -n lib%{name}-static
+%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-static-%{abi_version}.a
+%{_libdir}/libgauche-static-%{abi_version}.a
%files devel
%doc HACKING.adoc
%{_bindir}/gauche-config
-%{_libdir}/libgauche-%{main_version}.so
-%{_libdir}/gauche-%{main_version}/%{version}/include
-%{_libdir}/gauche-%{main_version}/%{version}/*/libgauche-%{main_version}.so
-%{_datadir}/gauche-%{main_version}/%{version}/package-templates
+%{_bindir}/gauche-install
+%{_bindir}/gauche-package
%{_datadir}/aclocal/gauche.m4
+%{_datadir}/gauche-%{abi_version}/%{version}/aclocal.m4
+%{_datadir}/gauche-%{abi_version}/%{version}/lib/build-standalone
+%{_datadir}/gauche-%{abi_version}/%{version}/lib/gencomp
+%{_datadir}/gauche-%{abi_version}/%{version}/lib/genstub
+%{_datadir}/gauche-%{abi_version}/%{version}/lib/precomp
+%{_datadir}/gauche-%{abi_version}/%{version}/package-templates
+%{_libdir}/gauche-%{abi_version}/%{version}/*/libgauche-%{abi_version}.so
+%{_libdir}/libgauche-%{abi_version}.so
+%{_libdir}/gauche-%{abi_version}/%{version}/include
%{_mandir}/man*/gauche-config*
+%{_mandir}/man*/gauche-install.*
+%{_mandir}/man*/gauche-package.*
+
+
+%files doc
+%{_infodir}/gauche-*
%changelog
+* Tue Mar 29 2022 Ali Erdinc Koroglu <aekoroglu(a)fedoraproject.org> - 0.9.11-1
+- Update to 0.9.11 (rhbz#2044282) and IPV6 option enabled
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.10-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 5f73ab6..88dd7df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Gauche-0.9.10.tgz) =
f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
+SHA512 (Gauche-0.9.11.tgz) =
49ab456b3dc723fe535429a067e6bd14a3dfd8809eba35b744611a58628bbca6cb7590b66015b2d2d247bb045cdbfca1108c6f917f68aadca79058bd61224d21