Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions SPECS-EXTENDED/jimtcl/jimtcl-fix_doc_paths.patch

This file was deleted.

27 changes: 27 additions & 0 deletions SPECS-EXTENDED/jimtcl/jimtcl-stdio-for-readline.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 35e0e1f9b1f018666e5170a35366c5fc3b97309c Mon Sep 17 00:00:00 2001
From: Steve Bennett <steveb@workware.net.au>
Date: Thu, 29 Aug 2024 08:25:11 +1000
Subject: [PATCH] readline: work around buggy readline.h

Some versions don't included needed stdio.h

Fixes: #308

Signed-off-by: Steve Bennett <steveb@workware.net.au>
---
jim-readline.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/jim-readline.c b/jim-readline.c
index 5715b2c9..c83e649b 100644
--- a/jim-readline.c
+++ b/jim-readline.c
@@ -34,6 +34,8 @@

#include <jim.h>

+#include <stdio.h>
+
#include <readline/readline.h>
#include <readline/history.h>

2 changes: 1 addition & 1 deletion SPECS-EXTENDED/jimtcl/jimtcl.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"jimtcl-0.78.tar.gz": "cf801795c9fd98bfff6882c14afdf96424ba86dead58c2a4e15978b176d3e12b"
"jimtcl-0.83.tar.gz": "6f2df00009f5ac4ad654c1ae1d2f8ed18191de38d1f5a88a54ea99cc16936686"
}
}
154 changes: 122 additions & 32 deletions SPECS-EXTENDED/jimtcl/jimtcl.spec
Original file line number Diff line number Diff line change
@@ -1,78 +1,169 @@
%bcond_without tests

Vendor: Microsoft Corporation
Distribution: Azure Linux
Name: jimtcl
Version: 0.78
Release: 5%{?dist}
Version: 0.83
Release: 3%{?dist}
Summary: A small embeddable Tcl interpreter

License: BSD
License: BSD-2-Clause-Views
URL: http://jim.tcl.tk
Source0: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: jimtcl-fix_doc_paths.patch
Comment thread
archana25-ms marked this conversation as resolved.
Source: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
# readline expects applications to include stdio.h, jimtcl was not
Patch: https://github.com/msteveb/jimtcl/commit/35e0e1f9b1f018666e5170a35366c5fc3b97309c.patch#/jimtcl-stdio-for-readline.diff

BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: asciidoc

%description
Jim is an opensource small-footprint implementation of the Tcl programming
BuildRequires: make
# Extension dependencies
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)
%if %{with tests}
BuildRequires: hostname
%endif

%global _description %{expand:
Jim is an opensource small-footprint implementation of the Tcl programming
language. It implements a large subset of Tcl and adds new features like
references with garbage collection, closures, built-in Object Oriented
Programming system, Functional Programming commands, first-class arrays and
UTF-8 support.
UTF-8 support.}

%description %{_description}


%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}

%description devel
%description devel %{_description}

The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch 0

%prep
%autosetup
rm -rf sqlite3

%build
#configure is not able to locate the needed binaries, so specify it manualy
export CC=gcc
export LD=ld
# export CC=gcc
# export LD=ld
export AR=ar
export RANLIB=ranlib
export STRIP=strip

%configure --full --shared --disable-option-checking
make %{?_smp_mflags}
# compile extensions that are disabled by default
# as modules
# see ./configure --extinfo for list
%configure --shared --disable-option-checking \
--allextmod \
%ifarch s390x # zlib test fails on s390x
--without-ext=zlib \
%endif
--docdir=%{_datadir}/doc/%{name}
%make_build

%check
make test

%install
%make_install
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
rm -rf %{buildroot}/%{_libdir}/jim/tcltest.tcl
pushd %{buildroot}/%{_libdir}/
ln -s libjim.so.* libjim.so
popd
%make_install INSTALL_DOCS=nodocs
rm %{buildroot}/%{_libdir}/jim/README.extensions


%if %{with tests}
%check
# remove tests that require network access
rm tests/ssl.test
make test
%endif

%ldconfig_scriptlets

%files
%doc LICENSE AUTHORS README Tcl.html
%license LICENSE
%doc AUTHORS README README.*
%doc EastAsianWidth.txt
%doc %{_datadir}/doc/%{name}/Tcl.html
%{_bindir}/jimdb
%{_bindir}/jimsh
%dir %{_libdir}/jim
%{_libdir}/jim/*.tcl
%{_libdir}/jim/*.so
%{_libdir}/libjim.so.*


%files devel
%doc DEVELOPING README.extensions README.metakit README.namespaces README.oo README.utf-8 STYLE
%doc CONTRIBUTING.md STYLE
%{_includedir}/*
%{_bindir}/build-jim-ext
%{_libdir}/libjim.so
%{_libdir}/pkgconfig/jimtcl.pc

%changelog
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.78-5
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
* Mon May 12 2025 Archana Shettigar <v-shettigara@microsoft.com> - 0.83-3
- Initial Azure Linux import from Fedora 42 (license: MIT).
- License verified

* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.83-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

* Fri Sep 20 2024 Michel Lind <salimma@fedoraproject.org> - 0.83-1
- Update to version 0.83; Fixes: RHBZ#2309077

* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Tue Feb 28 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.82-2
- Properly disable zlib extension on s390x
- move README files meant for programming with jimtcl to main package

* Tue Feb 28 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.82-1
- Update to 0.82
- enable more extensions
- update license to use SPDX

* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.81-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.81-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.81-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Fri Jan 07 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.81-2
- Disable zlib module on s390x (tests fail)

* Fri Jan 07 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.81-1
- Update to 0.81
- Ship extensions that are disabled by default as modules
- Opt in to rpmautospec

* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

* Thu Aug 06 2020 Jeff Law <law@redhat.com> - 0.78-6
- Depend on g++

* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-6
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Expand Down Expand Up @@ -153,4 +244,3 @@ popd

* Sun May 05 2013 Markus Mayer <lotharlutz@gmx.de> - 0.73-1
- inital prm release

4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7931,8 +7931,8 @@
"type": "other",
"other": {
"name": "jimtcl",
"version": "0.78",
"downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.78/jimtcl-0.78.tar.gz"
"version": "0.83",
"downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.83/jimtcl-0.83.tar.gz"
}
}
},
Expand Down
Loading