import jimtcl-0.77-6.el8

This commit is contained in:
CentOS Sources 2021-03-30 15:40:06 -04:00 committed by Stepan Oksanichenko
parent d1cce179cc
commit c40590acfb
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 505cbc9ba972000ce70001ca520b95ff469c3050 Mon Sep 17 00:00:00 2001
From: Antonio Cardace <acardace@redhat.com>
Date: Tue, 18 Aug 2020 13:06:52 +0200
Subject: [PATCH] docs: remove generation of "Last updated" field
The generation of this field would make the resulting Tcl.html different between builds,
as it records the time of generation, remove this as it causes jimtcl packages for different
arches to have a file conflict on Tcl.html
Resolves: #1853148
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index a803b07..59f349e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -203,7 +203,7 @@ zlib.so: jim-zlib.c
$(CC) $(CFLAGS) $(LDFLAGS) $(SHOBJ_LDFLAGS) -o $@ jim-zlib.o $(SH_LIBJIM) @LDLIBS_zlib@
Tcl.html: jim_tcl.txt
- @tclsh@ @srcdir@/make-index $> $^ | asciidoc -o $@ -d manpage - || cp @srcdir@/Tcl_shipped.html Tcl.html
+ @tclsh@ @srcdir@/make-index $> $^ | asciidoc --attribute footer-style=none -o $@ -d manpage - || cp @srcdir@/Tcl_shipped.html Tcl.html
clean:
rm -f *.o *.so *.dll *.exe lib*.a $(JIMSH) $(LIBJIM) Tcl.html _*.c
--
2.26.2

View File

@ -3,7 +3,7 @@
Name: jimtcl Name: jimtcl
Version: 0.77 Version: 0.77
Release: 5%{?dist} Release: 6%{?dist}
Summary: A small embeddable Tcl interpreter Summary: A small embeddable Tcl interpreter
License: BSD License: BSD
@ -11,6 +11,7 @@ Group: Development/Languages
URL: http://jim.tcl.tk URL: http://jim.tcl.tk
Source0: https://github.com/msteveb/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz Source0: https://github.com/msteveb/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
Patch0: jimtcl-fix_doc_paths.patch Patch0: jimtcl-fix_doc_paths.patch
Patch1: 0001-docs-remove-generation-of-Last-updated-field.patch
BuildRequires: asciidoc BuildRequires: asciidoc
@ -33,6 +34,7 @@ developing applications that use %{name}.
%prep %prep
%setup -qn %{name}-%{commit} %setup -qn %{name}-%{commit}
%patch0 %patch0
%patch1 -p1
rm -rf sqlite3 rm -rf sqlite3
@ -57,6 +59,15 @@ rm -rf %{buildroot}/%{_libdir}/jim/tcltest.tcl
pushd %{buildroot}/%{_libdir}/ pushd %{buildroot}/%{_libdir}/
ln -s libjim.so.* libjim.so ln -s libjim.so.* libjim.so
popd popd
pushd %{buildroot}/%{_bindir}/
mv build-jim-ext build-jim-ext-%{_arch}
cat > build-jim-ext << 'EOF'
#!/bin/sh
exec %{_bindir}/build-jim-ext-$(uname -m) "$@"
EOF
chmod +x build-jim-ext
popd
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -71,9 +82,13 @@ popd
%doc DEVELOPING README.extensions README.metakit README.namespaces README.oo README.utf-8 STYLE %doc DEVELOPING README.extensions README.metakit README.namespaces README.oo README.utf-8 STYLE
%{_includedir}/* %{_includedir}/*
%{_bindir}/build-jim-ext %{_bindir}/build-jim-ext
%{_bindir}/build-jim-ext-%{_arch}
%{_libdir}/libjim.so %{_libdir}/libjim.so
%changelog %changelog
* Tue Aug 18 2020 Antonio Cardace <acardace@redhat.com> - 0.77-6
- Removed multilib packages file conflicts (rh #1853148)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-5 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.77-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild