From 5e1bfa989717244ce660c3da0aaf1d1c38b46c7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:18:50 +0000 Subject: [PATCH 01/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 06bcdae..baea682 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPLv2+ @@ -161,6 +161,9 @@ chown %{usrname}:%{usrname} %{_sharedstatedir}/%{usrname} %{_gap_dir}/pkg/%{PKGNAME}/example/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 71a4c547c9b73287f2e1e2d9cfc2c706c837e56d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:45:16 +0000 Subject: [PATCH 02/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index baea682..5bf813e 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPLv2+ @@ -161,6 +161,9 @@ chown %{usrname}:%{usrname} %{_sharedstatedir}/%{usrname} %{_gap_dir}/pkg/%{PKGNAME}/example/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f909f992d8e46882fcc4c50b2228b0bb4d6cbf49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:52:11 +0000 Subject: [PATCH 03/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 5bf813e..75ad92b 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPLv2+ @@ -161,6 +161,9 @@ chown %{usrname}:%{usrname} %{_sharedstatedir}/%{usrname} %{_gap_dir}/pkg/%{PKGNAME}/example/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7121abe18403ed034981d9bad392795e121cfdb2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 8 Jul 2022 13:11:17 -0600 Subject: [PATCH 04/24] Add README.md. Update %description. --- README.md | 7 +++++++ gap-pkg-scscp.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..bfc4d05 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# gap-pkg-scscp + +[This package](https://gap-packages.github.io/scscp/) implements the Symbolic +Computation Software Composability Protocol (SCSCP) for the +[GAP](https://www.gap-system.org/) system in accordance with the +[SCSCP specification](https://openmath.org/standard/scscp/) and OpenMath +dictionaries scscp1 and scscp2. diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 75ad92b..3dd80ee 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -37,7 +37,7 @@ Requires: logrotate %description This package implements the Symbolic Computation Software Composability Protocol (SCSCP) for the GAP system in accordance with the SCSCP -specification, described at http://www.symbolic-computing.org/scscp, and +specification, described at https://openmath.org/standard/scscp/, and OpenMath dictionaries scscp1 and scscp2. %package doc From 251928df8cf6cb7031aa388ba1639e666c16b277 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 04:04:55 +0000 Subject: [PATCH 05/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 3dd80ee..3b2e2d5 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPLv2+ @@ -161,6 +161,9 @@ chown %{usrname}:%{usrname} %{_sharedstatedir}/%{usrname} %{_gap_dir}/pkg/%{PKGNAME}/example/ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 7b45f725c7dda7bdf9ce0f32072da7349c901184 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 27 Sep 2022 13:03:50 -0600 Subject: [PATCH 06/24] Update for gap 4.12.0. - Convert License tag to SPDX. - Use systemd-sysusers to create the daemon user. --- gap-pkg-scscp.rpmlintrc | 8 ---- gap-pkg-scscp.spec | 97 ++++++++++++++++++++++------------------- gap-pkg-scscp.sysusers | 2 + 3 files changed, 53 insertions(+), 54 deletions(-) delete mode 100644 gap-pkg-scscp.rpmlintrc create mode 100644 gap-pkg-scscp.sysusers diff --git a/gap-pkg-scscp.rpmlintrc b/gap-pkg-scscp.rpmlintrc deleted file mode 100644 index f872ac1..0000000 --- a/gap-pkg-scscp.rpmlintrc +++ /dev/null @@ -1,8 +0,0 @@ -# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON -# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors - -# The documentation package has no binary bits -addFilter(r'gap-pkg-scscp-doc\.noarch: W: only-non-binary-in-usr-lib') - -# The documentation subpackage is the documentation -addFilter(r'gap-pkg-scscp-doc\.noarch: W: no-documentation') diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 3b2e2d5..cd511c9 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -1,22 +1,24 @@ %global pkgname scscp -%global PKGNAME SCSCP +%global upname SCSCP %global usrname gapd Name: gap-pkg-%{pkgname} Version: 2.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP -License: GPLv2+ -URL: https://gap-packages.github.io/scscp/ +License: GPL-2.0-or-later BuildArch: noarch -Source0: https://github.com/gap-packages/%{pkgname}/releases/download/v%{version}/%{PKGNAME}-%{version}.tar.gz +ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch +URL: https://gap-packages.github.io/scscp/ +Source0: https://github.com/gap-packages/%{pkgname}/releases/download/v%{version}/%{upname}-%{version}.tar.gz Source1: %{usrname}.sh Source2: gap-scscp.service Source3: %{usrname}.logrotate Source4: %{usrname}.conf Source5: %{usrname}.h2m Source6: server.g +Source7: %{name}.sysusers # Fix a typo in makedoc.g. Patch0: %{name}-makedoc.patch @@ -28,9 +30,9 @@ BuildRequires: gap-pkg-openmath-doc BuildRequires: gap-pkg-smallgrp-doc BuildRequires: help2man BuildRequires: systemd +BuildRequires: systemd-rpm-macros %{?systemd_requires} -Requires(pre): shadow-utils Requires: gap-pkg-openmath Requires: logrotate @@ -51,31 +53,35 @@ Requires: gap-pkg-smallgrp-doc This package contains documentation for gap-pkg-%{pkgname}. %prep -%autosetup -p0 -n %{PKGNAME}-%{version} +%autosetup -p0 -n %{upname}-%{version} %build +export LC_ALL=C.UTF-8 + # Link to main GAP documentation -ln -s %{_gap_dir}/doc ../../doc +ln -s %{gap_dir}/doc ../../doc mkdir ../pkg -ln -s ../%{PKGNAME}-%{version} ../pkg/%{PKGNAME} -ln -s %{_gap_dir}/pkg/io-* ../pkg -ln -s %{_gap_dir}/pkg/OpenMath-* ../pkg -ln -s %{_gap_dir}/pkg/SmallGrp-* ../pkg -gap -l "$PWD/..;%{_gap_dir}" makedoc.g +ln -s ../%{upname}-%{version} ../pkg/%{upname} +gap -l "$PWD/..;" makedoc.g rm -fr ../../doc ../pkg %install -mkdir -p %{buildroot}%{_gap_dir}/pkg -cp -a ../%{PKGNAME}-%{version} %{buildroot}%{_gap_dir}/pkg/%{PKGNAME} -rm -f %{buildroot}%{_gap_dir}/pkg/%{PKGNAME}/{COPYING,README.md,todo.txt} -rm -f %{buildroot}%{_gap_dir}/pkg/%{PKGNAME}/doc/*.{aux,bbl,blg,brf,idx,ilg,ind,log,out,pnr,tex} +mkdir -p %{buildroot}%{gap_dir}/pkg/%{upname}/doc +cp -a *.g *.sh demo example lib par tracing tst \ + %{buildroot}%{gap_dir}/pkg/%{upname} +%gap_copy_docs -n %{upname} +cp -a doc/img %{buildroot}%{gap_dir}/pkg/%{upname}/doc # Replace upstream's launcher script with our own. -install -p -m 0755 %{SOURCE1} %{buildroot}%{_gap_dir}/pkg/%{PKGNAME} +install -p -m 0755 %{SOURCE1} %{buildroot}%{gap_dir}/pkg/%{upname} # Make the daemon's home directory mkdir -p %{buildroot}%{_sharedstatedir}/%{usrname} +# Install the sysusers file +mkdir -p %{buildroot}%{_sysusersdir} +cp -p %{SOURCE7} %{buildroot}%{_sysusersdir}/%{usrname}.conf + # Install the systemd unit mkdir -p %{buildroot}%{_unitdir} install -p -m 0644 -p %{SOURCE2} %{buildroot}%{_unitdir} @@ -97,33 +103,29 @@ help2man -m "GAP SCSCP package" -S "GAP SCSCP (Fedora %{version}-%{release})" \ # Move the config files to their new home mkdir -p %{buildroot}%{_sysconfdir}/scscp/gap install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/scscp/gap -mv %{buildroot}%{_gap_dir}/pkg/%{PKGNAME}/config.g \ - %{buildroot}%{_gap_dir}/pkg/%{PKGNAME}/configpar.g \ +mv %{buildroot}%{gap_dir}/pkg/%{upname}/config.g \ + %{buildroot}%{gap_dir}/pkg/%{upname}/configpar.g \ %{buildroot}%{_sysconfdir}/scscp/gap - -# Tell the package where to look for its configuration -sed -e 's,ReadPackage("scscp/\(config\.g\)"),Read("/etc/scscp/gap/\1"),' \ - -e 's,ReadPackage("scscp/\(configpar\.g\)"),Read("/etc/scscp/gap/\1"),' \ - -i %{buildroot}%{_gap_dir}/pkg/%{PKGNAME}/init.g -touch -r init.g %{buildroot}%{_gap_dir}/pkg/%{PKGNAME}/init.g +ln -s %{_sysconfdir}/scscp/gap/config.g %{buildroot}%{gap_dir}/pkg/%{upname} +ln -s %{_sysconfdir}/scscp/gap/configpar.g %{buildroot}%{gap_dir}/pkg/%{upname} %check +export LC_ALL=C.UTF-8 + # We only run the offline test as the others require network access and two # servers to be setup and running. mkdir ../pkg -ln -s ../%{PKGNAME}-%{version} ../pkg/%{PKGNAME} -pushd tst -gap -l "$PWD/../..;%{_gap_dir}" << EOF +ln -s ../%{upname}-%{version} ../pkg/%{upname} +cd tst +gap -l "$PWD/../..;" << EOF LoadPackage("scscp"); GAP_EXIT_CODE(Test("offline.tst", rec(compareFunction := "uptowhitespace") )); EOF -popd +cd - rm -fr ../pkg %pre -getent passwd %{usrname} >/dev/null || \ - useradd -c "GAP SCSCP server daemon" -d %{_sharedstatedir}/%{usrname} \ - -r -s /sbin/nologin -U %{usrname} || : +%sysusers_create_package %{usrname} %{SOURCE7} %preun %systemd_preun gap-scscp.service @@ -131,17 +133,15 @@ getent passwd %{usrname} >/dev/null || \ %post %systemd_post gap-scscp.service -%posttrans -chown %{usrname}:%{usrname} %{_sharedstatedir}/%{usrname} - %files %doc README.md todo.txt %license COPYING -%{_gap_dir}/pkg/%{PKGNAME}/ -%exclude %{_gap_dir}/pkg/%{PKGNAME}/demo/ -%exclude %{_gap_dir}/pkg/%{PKGNAME}/doc/ -%exclude %{_gap_dir}/pkg/%{PKGNAME}/example/ +%{gap_dir}/pkg/%{upname}/ +%exclude %{gap_dir}/pkg/%{upname}/demo/ +%exclude %{gap_dir}/pkg/%{upname}/doc/ +%exclude %{gap_dir}/pkg/%{upname}/example/ %{_mandir}/man8/%{usrname}.8* +%{_sysusersdir}/%{usrname}.conf %{_unitdir}/gap-scscp.service %dir %{_sysconfdir}/scscp/ %dir %{_sysconfdir}/scscp/gap/ @@ -153,14 +153,19 @@ chown %{usrname}:%{usrname} %{_sharedstatedir}/%{usrname} %attr(755,%{usrname},%{usrname}) %{_sharedstatedir}/%{usrname}/ %files doc -%docdir %{_gap_dir}/pkg/%{PKGNAME}/demo/ -%docdir %{_gap_dir}/pkg/%{PKGNAME}/doc/ -%docdir %{_gap_dir}/pkg/%{PKGNAME}/example/ -%{_gap_dir}/pkg/%{PKGNAME}/demo/ -%{_gap_dir}/pkg/%{PKGNAME}/doc/ -%{_gap_dir}/pkg/%{PKGNAME}/example/ +%docdir %{gap_dir}/pkg/%{upname}/demo/ +%docdir %{gap_dir}/pkg/%{upname}/doc/ +%docdir %{gap_dir}/pkg/%{upname}/example/ +%{gap_dir}/pkg/%{upname}/demo/ +%{gap_dir}/pkg/%{upname}/doc/ +%{gap_dir}/pkg/%{upname}/example/ %changelog +* Tue Sep 27 2022 Jerry James - 2.3.1-8 +- Update for gap 4.12.0 +- Convert License tag to SPDX +- Use systemd-sysusers to create the daemon user + * Thu Jul 21 2022 Fedora Release Engineering - 2.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/gap-pkg-scscp.sysusers b/gap-pkg-scscp.sysusers new file mode 100644 index 0000000..6972630 --- /dev/null +++ b/gap-pkg-scscp.sysusers @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u gapd - "GAP SCSCP server daemon" /var/lib/gapd /sbin/nologin From edfd09b63b1a4a34aebd93e5e38dbf19a0ab0d99 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 10 Nov 2022 11:09:41 -0700 Subject: [PATCH 07/24] Clarify license of the doc subpackage. --- gap-pkg-scscp.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index cd511c9..b997646 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -11,7 +11,7 @@ License: GPL-2.0-or-later BuildArch: noarch ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch URL: https://gap-packages.github.io/scscp/ -Source0: https://github.com/gap-packages/%{pkgname}/releases/download/v%{version}/%{upname}-%{version}.tar.gz +Source0: https://github.com/gap-packages/scscp/releases/download/v%{version}/%{upname}-%{version}.tar.gz Source1: %{usrname}.sh Source2: gap-scscp.service Source3: %{usrname}.logrotate @@ -43,6 +43,12 @@ specification, described at https://openmath.org/standard/scscp/, and OpenMath dictionaries scscp1 and scscp2. %package doc +# The content is GPL-2.0-or-later. The remaining licenses cover the various +# fonts embedded in PDFs. +# CM: Knuth-CTAN AND LicenseRef-Fedora-Public-Domain +# CM-Super: GPL-1.0-or-later +# Nimbus: AGPL-3.0-only +License: GPL-2.0-or-later AND Knuth-CTAN AND LicenseRef-Fedora-Public-Domain AND GPL-1.0-or-later AND AGPL-3.0-only Summary: SCSCP documentation Requires: %{name} = %{version}-%{release} Requires: gap-pkg-io-doc @@ -161,6 +167,9 @@ rm -fr ../pkg %{gap_dir}/pkg/%{upname}/example/ %changelog +* Thu Nov 10 2022 Jerry James - 2.3.1-8 +- Clarify license of the doc subpackage + * Tue Sep 27 2022 Jerry James - 2.3.1-8 - Update for gap 4.12.0 - Convert License tag to SPDX From 7bfadddfad6aeb548a16e8dc804cd0e329c347be Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 11 Dec 2022 09:41:25 -0700 Subject: [PATCH 08/24] Version 2.4.0. --- gap-pkg-scscp-makedoc.patch | 6 +++--- gap-pkg-scscp.spec | 11 +++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gap-pkg-scscp-makedoc.patch b/gap-pkg-scscp-makedoc.patch index 0bd2792..257e736 100644 --- a/gap-pkg-scscp-makedoc.patch +++ b/gap-pkg-scscp-makedoc.patch @@ -1,5 +1,5 @@ ---- makedoc.g.orig 2019-05-19 14:48:52.000000000 -0600 -+++ makedoc.g 2019-06-25 13:46:16.209738296 -0600 +--- makedoc.g.orig 2022-12-10 08:28:31.000000000 -0700 ++++ makedoc.g 2022-12-11 09:27:37.593145344 -0700 @@ -6,7 +6,7 @@ ########################################################################### @@ -19,4 +19,4 @@ + if pos2 <> fail then pos := pos2; fi; comment := location{[ pos+3 .. Length(location) ]}; fi; - AppendTo(output, "# ", comment, ":", a[2][2], "-", a[2][3], a[1]); + AppendTo(output, "# ", comment, ":", a[2][2], "-", a[2][3], "\n", StripBeginEnd(a[1], "\n"), "\n\n"); diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index b997646..fd06561 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -3,8 +3,8 @@ %global usrname gapd Name: gap-pkg-%{pkgname} -Version: 2.3.1 -Release: 8%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -45,10 +45,10 @@ OpenMath dictionaries scscp1 and scscp2. %package doc # The content is GPL-2.0-or-later. The remaining licenses cover the various # fonts embedded in PDFs. -# CM: Knuth-CTAN AND LicenseRef-Fedora-Public-Domain +# CM: Knuth-CTAN # CM-Super: GPL-1.0-or-later # Nimbus: AGPL-3.0-only -License: GPL-2.0-or-later AND Knuth-CTAN AND LicenseRef-Fedora-Public-Domain AND GPL-1.0-or-later AND AGPL-3.0-only +License: GPL-2.0-or-later AND Knuth-CTAN AND GPL-1.0-or-later AND AGPL-3.0-only Summary: SCSCP documentation Requires: %{name} = %{version}-%{release} Requires: gap-pkg-io-doc @@ -167,6 +167,9 @@ rm -fr ../pkg %{gap_dir}/pkg/%{upname}/example/ %changelog +* Sun Dec 11 2022 Jerry James - 2.4.0-1 +- Version 2.4.0 + * Thu Nov 10 2022 Jerry James - 2.3.1-8 - Clarify license of the doc subpackage diff --git a/sources b/sources index 50d2028..5557a4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SCSCP-2.3.1.tar.gz) = 94193341de0ae2f33a32bb96406d7954ca84f58c9e7bca1e141e8072df217d9a4eaf5f507abcf3abf41bb44fe2e7162575e325f0779642493af4b4ad6e898ebb +SHA512 (SCSCP-2.4.0.tar.gz) = 2a1b44fffebe57c99b757168a24ef6c880b0d5783eb2845527a729011cba1ac1b0bc6c0e768151da10b03b4355330b7b5a7019177085abc51757b8f06c04f063 From a94abbf1b7fb957336503f721e29035b9b7fc96b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 12 Jan 2023 16:08:22 -0700 Subject: [PATCH 09/24] Update for split GAP directories. --- gap-pkg-scscp.spec | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index fd06561..6622409 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -65,21 +65,21 @@ This package contains documentation for gap-pkg-%{pkgname}. export LC_ALL=C.UTF-8 # Link to main GAP documentation -ln -s %{gap_dir}/doc ../../doc +ln -s %{gap_libdir}/doc ../../doc mkdir ../pkg ln -s ../%{upname}-%{version} ../pkg/%{upname} gap -l "$PWD/..;" makedoc.g rm -fr ../../doc ../pkg %install -mkdir -p %{buildroot}%{gap_dir}/pkg/%{upname}/doc +mkdir -p %{buildroot}%{gap_libdir}/pkg/%{upname}/doc cp -a *.g *.sh demo example lib par tracing tst \ - %{buildroot}%{gap_dir}/pkg/%{upname} + %{buildroot}%{gap_libdir}/pkg/%{upname} %gap_copy_docs -n %{upname} -cp -a doc/img %{buildroot}%{gap_dir}/pkg/%{upname}/doc +cp -a doc/img %{buildroot}%{gap_libdir}/pkg/%{upname}/doc # Replace upstream's launcher script with our own. -install -p -m 0755 %{SOURCE1} %{buildroot}%{gap_dir}/pkg/%{upname} +install -p -m 0755 %{SOURCE1} %{buildroot}%{gap_libdir}/pkg/%{upname} # Make the daemon's home directory mkdir -p %{buildroot}%{_sharedstatedir}/%{usrname} @@ -109,11 +109,11 @@ help2man -m "GAP SCSCP package" -S "GAP SCSCP (Fedora %{version}-%{release})" \ # Move the config files to their new home mkdir -p %{buildroot}%{_sysconfdir}/scscp/gap install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/scscp/gap -mv %{buildroot}%{gap_dir}/pkg/%{upname}/config.g \ - %{buildroot}%{gap_dir}/pkg/%{upname}/configpar.g \ +mv %{buildroot}%{gap_libdir}/pkg/%{upname}/config.g \ + %{buildroot}%{gap_libdir}/pkg/%{upname}/configpar.g \ %{buildroot}%{_sysconfdir}/scscp/gap -ln -s %{_sysconfdir}/scscp/gap/config.g %{buildroot}%{gap_dir}/pkg/%{upname} -ln -s %{_sysconfdir}/scscp/gap/configpar.g %{buildroot}%{gap_dir}/pkg/%{upname} +ln -s %{_sysconfdir}/scscp/gap/config.g %{buildroot}%{gap_libdir}/pkg/%{upname} +ln -s %{_sysconfdir}/scscp/gap/configpar.g %{buildroot}%{gap_libdir}/pkg/%{upname} %check export LC_ALL=C.UTF-8 @@ -142,10 +142,10 @@ rm -fr ../pkg %files %doc README.md todo.txt %license COPYING -%{gap_dir}/pkg/%{upname}/ -%exclude %{gap_dir}/pkg/%{upname}/demo/ -%exclude %{gap_dir}/pkg/%{upname}/doc/ -%exclude %{gap_dir}/pkg/%{upname}/example/ +%{gap_libdir}/pkg/%{upname}/ +%exclude %{gap_libdir}/pkg/%{upname}/demo/ +%exclude %{gap_libdir}/pkg/%{upname}/doc/ +%exclude %{gap_libdir}/pkg/%{upname}/example/ %{_mandir}/man8/%{usrname}.8* %{_sysusersdir}/%{usrname}.conf %{_unitdir}/gap-scscp.service @@ -159,14 +159,17 @@ rm -fr ../pkg %attr(755,%{usrname},%{usrname}) %{_sharedstatedir}/%{usrname}/ %files doc -%docdir %{gap_dir}/pkg/%{upname}/demo/ -%docdir %{gap_dir}/pkg/%{upname}/doc/ -%docdir %{gap_dir}/pkg/%{upname}/example/ -%{gap_dir}/pkg/%{upname}/demo/ -%{gap_dir}/pkg/%{upname}/doc/ -%{gap_dir}/pkg/%{upname}/example/ +%docdir %{gap_libdir}/pkg/%{upname}/demo/ +%docdir %{gap_libdir}/pkg/%{upname}/doc/ +%docdir %{gap_libdir}/pkg/%{upname}/example/ +%{gap_libdir}/pkg/%{upname}/demo/ +%{gap_libdir}/pkg/%{upname}/doc/ +%{gap_libdir}/pkg/%{upname}/example/ %changelog +* Thu Jan 12 2023 Jerry James - 2.4.0-2 +- Update for split GAP directories + * Sun Dec 11 2022 Jerry James - 2.4.0-1 - Version 2.4.0 From 4b4a44179301902ac541647b6c7dc10ae1a4d612 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:19:38 +0000 Subject: [PATCH 10/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 6622409..d7435f3 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -167,6 +167,9 @@ rm -fr ../pkg %{gap_libdir}/pkg/%{upname}/example/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jan 12 2023 Jerry James - 2.4.0-2 - Update for split GAP directories From 78a870297ffb6b6a745f36e90f580f88396215c0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 14 Feb 2023 14:38:03 -0700 Subject: [PATCH 11/24] Use the %gap_arches macro. --- gap-pkg-scscp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index d7435f3..6753bf8 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -9,7 +9,7 @@ Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later BuildArch: noarch -ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch +ExclusiveArch: %{gap_arches} noarch URL: https://gap-packages.github.io/scscp/ Source0: https://github.com/gap-packages/scscp/releases/download/v%{version}/%{upname}-%{version}.tar.gz Source1: %{usrname}.sh From 57b3242a0b4831859356c8fb9921f049828e732a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 26 Feb 2023 10:31:37 -0700 Subject: [PATCH 12/24] Version 2.4.1. --- gap-pkg-scscp.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 6753bf8..4fdf183 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -3,8 +3,8 @@ %global usrname gapd Name: gap-pkg-%{pkgname} -Version: 2.4.0 -Release: 3%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -167,6 +167,9 @@ rm -fr ../pkg %{gap_libdir}/pkg/%{upname}/example/ %changelog +* Sun Feb 26 2023 Jerry James - 2.4.1-1 +- Version 2.4.1 + * Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 5557a4e..e308c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SCSCP-2.4.0.tar.gz) = 2a1b44fffebe57c99b757168a24ef6c880b0d5783eb2845527a729011cba1ac1b0bc6c0e768151da10b03b4355330b7b5a7019177085abc51757b8f06c04f063 +SHA512 (SCSCP-2.4.1.tar.gz) = 8fd8d1e2f70b71f23ef74ff7dadc156c2bcae71ddc80ad62e59465c0fae2b644f2bffe86cbf083856d0ebb233794621299dd225f186a7a686bf9bd3a59173f5c From b2066f9bd9d304cde4c604c1f9473033d3c68f86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:44:17 +0000 Subject: [PATCH 13/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 4fdf183..8f1e5a9 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -167,6 +167,9 @@ rm -fr ../pkg %{gap_libdir}/pkg/%{upname}/example/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Feb 26 2023 Jerry James - 2.4.1-1 - Version 2.4.1 From 5f59b7ecbfd5dfef1dc135287fcf89ab95136e80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 20:13:41 +0000 Subject: [PATCH 14/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 8f1e5a9..705f874 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -167,6 +167,9 @@ rm -fr ../pkg %{gap_libdir}/pkg/%{upname}/example/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f2c0b2fce0f5c1bf6cbef0f1d729485bde21013f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:28:07 +0000 Subject: [PATCH 15/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gap-pkg-scscp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 705f874..010f9d9 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -167,6 +167,9 @@ rm -fr ../pkg %{gap_libdir}/pkg/%{upname}/example/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 501aebe82d732ad3e2144216eb86d1142a802533 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 9 Feb 2024 13:28:20 -0700 Subject: [PATCH 16/24] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 99 +++++++++++++++++++++++++++++++++++++++++++ gap-pkg-scscp.spec | 102 +-------------------------------------------- 2 files changed, 101 insertions(+), 100 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..1c297e8 --- /dev/null +++ b/changelog @@ -0,0 +1,99 @@ +* Wed Jan 24 2024 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Feb 26 2023 Jerry James - 2.4.1-1 +- Version 2.4.1 + +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 Jerry James - 2.4.0-2 +- Update for split GAP directories + +* Sun Dec 11 2022 Jerry James - 2.4.0-1 +- Version 2.4.0 + +* Thu Nov 10 2022 Jerry James - 2.3.1-8 +- Clarify license of the doc subpackage + +* Tue Sep 27 2022 Jerry James - 2.3.1-8 +- Update for gap 4.12.0 +- Convert License tag to SPDX +- Use systemd-sysusers to create the daemon user + +* Thu Jul 21 2022 Fedora Release Engineering - 2.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 22 2020 Jerry James - 2.3.1-1 +- Version 2.3.1 +- Depend on logrotate instead of owning its config directory + +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 25 2019 Jerry James - 2.3.0-1 +- New upstream version +- Drop upstreamed -ref patch +- Add -makedoc patch to fix documentation building +- Fix creation of the daemon home dir + +* Fri Mar 8 2019 Tim Landscheidt - 2.2.3-6 +- Remove obsolete requirement for %%postun scriptlet + +* Sat Feb 2 2019 Jerry James - 2.2.3-5 +- Rebuild for gap 4.10.0 +- Add -ref patch +- Add -doc subpackage + +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Sep 26 2017 Jerry James - 2.2.3-1 +- New upstream version + +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Apr 1 2017 Jerry James - 2.2.2-1 +- New upstream version +- New URLs + +* Fri Feb 10 2017 Fedora Release Engineering - 2.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jul 20 2016 Jerry James - 2.1.4-3 +- Own the logrotate directory +- Do not delete the user in postun + +* Thu May 26 2016 Jerry James - 2.1.4-2 +- Improved service integration + +* Fri Apr 22 2016 Jerry James - 2.1.4-1 +- Initial RPM diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 010f9d9..0ffd8d8 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -4,7 +4,7 @@ Name: gap-pkg-%{pkgname} Version: 2.4.1 -Release: 4%{?dist} +Release: %autorelease Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later @@ -167,102 +167,4 @@ rm -fr ../pkg %{gap_libdir}/pkg/%{upname}/example/ %changelog -* Wed Jan 24 2024 Fedora Release Engineering - 2.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Feb 26 2023 Jerry James - 2.4.1-1 -- Version 2.4.1 - -* Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jan 12 2023 Jerry James - 2.4.0-2 -- Update for split GAP directories - -* Sun Dec 11 2022 Jerry James - 2.4.0-1 -- Version 2.4.0 - -* Thu Nov 10 2022 Jerry James - 2.3.1-8 -- Clarify license of the doc subpackage - -* Tue Sep 27 2022 Jerry James - 2.3.1-8 -- Update for gap 4.12.0 -- Convert License tag to SPDX -- Use systemd-sysusers to create the daemon user - -* Thu Jul 21 2022 Fedora Release Engineering - 2.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 2.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 22 2020 Jerry James - 2.3.1-1 -- Version 2.3.1 -- Depend on logrotate instead of owning its config directory - -* Thu Jul 25 2019 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 25 2019 Jerry James - 2.3.0-1 -- New upstream version -- Drop upstreamed -ref patch -- Add -makedoc patch to fix documentation building -- Fix creation of the daemon home dir - -* Fri Mar 8 2019 Tim Landscheidt - 2.2.3-6 -- Remove obsolete requirement for %%postun scriptlet - -* Sat Feb 2 2019 Jerry James - 2.2.3-5 -- Rebuild for gap 4.10.0 -- Add -ref patch -- Add -doc subpackage - -* Thu Jan 31 2019 Fedora Release Engineering - 2.2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Sep 26 2017 Jerry James - 2.2.3-1 -- New upstream version - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Apr 1 2017 Jerry James - 2.2.2-1 -- New upstream version -- New URLs - -* Fri Feb 10 2017 Fedora Release Engineering - 2.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jul 20 2016 Jerry James - 2.1.4-3 -- Own the logrotate directory -- Do not delete the user in postun - -* Thu May 26 2016 Jerry James - 2.1.4-2 -- Improved service integration - -* Fri Apr 22 2016 Jerry James - 2.1.4-1 -- Initial RPM +%autochangelog From d6962b4f541d836cd3907969beaf79f6f471e151 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 16 Mar 2024 17:03:24 -0600 Subject: [PATCH 17/24] Version 2.4.2 --- gap-pkg-scscp.spec | 9 +++++---- sources | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 0ffd8d8..438c17c 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -3,15 +3,17 @@ %global usrname gapd Name: gap-pkg-%{pkgname} -Version: 2.4.1 +Version: 2.4.2 Release: %autorelease Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later BuildArch: noarch -ExclusiveArch: %{gap_arches} noarch +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} URL: https://gap-packages.github.io/scscp/ -Source0: https://github.com/gap-packages/scscp/releases/download/v%{version}/%{upname}-%{version}.tar.gz +VCS: https://github.com/gap-packages/scscp +Source0: %{vcs}/releases/download/v%{version}/%{upname}-%{version}.tar.gz Source1: %{usrname}.sh Source2: gap-scscp.service Source3: %{usrname}.logrotate @@ -29,7 +31,6 @@ BuildRequires: gap-pkg-io-doc BuildRequires: gap-pkg-openmath-doc BuildRequires: gap-pkg-smallgrp-doc BuildRequires: help2man -BuildRequires: systemd BuildRequires: systemd-rpm-macros %{?systemd_requires} diff --git a/sources b/sources index e308c57..cd66cef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SCSCP-2.4.1.tar.gz) = 8fd8d1e2f70b71f23ef74ff7dadc156c2bcae71ddc80ad62e59465c0fae2b644f2bffe86cbf083856d0ebb233794621299dd225f186a7a686bf9bd3a59173f5c +SHA512 (SCSCP-2.4.2.tar.gz) = 0d7f7dd0b6c79c768804e8222c4e8e9d03403eda6490da70c8327ef479f3f690b82bfe0176c0847377051ff218976d39c3faa284d95f108d85a0bec48d394705 From 9bff67b35d6e595d8dc3b4235fe042696ae60bd0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 8 Jul 2024 08:35:21 -0600 Subject: [PATCH 18/24] Version 2.4.3 - Add missing runtime dependency on gap-pkg-io --- gap-pkg-scscp.spec | 8 +++++--- sources | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 438c17c..2922cf5 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -1,9 +1,10 @@ %global pkgname scscp %global upname SCSCP %global usrname gapd +%global giturl https://github.com/gap-packages/scscp Name: gap-pkg-%{pkgname} -Version: 2.4.2 +Version: 2.4.3 Release: %autorelease Summary: Symbolic Computation Software Composability Protocol in GAP @@ -12,8 +13,8 @@ BuildArch: noarch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} URL: https://gap-packages.github.io/scscp/ -VCS: https://github.com/gap-packages/scscp -Source0: %{vcs}/releases/download/v%{version}/%{upname}-%{version}.tar.gz +VCS: git:%{giturl}.git +Source0: %{giturl}/releases/download/v%{version}/%{upname}-%{version}.tar.gz Source1: %{usrname}.sh Source2: gap-scscp.service Source3: %{usrname}.logrotate @@ -34,6 +35,7 @@ BuildRequires: help2man BuildRequires: systemd-rpm-macros %{?systemd_requires} +Requires: gap-pkg-io Requires: gap-pkg-openmath Requires: logrotate diff --git a/sources b/sources index cd66cef..3a300fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SCSCP-2.4.2.tar.gz) = 0d7f7dd0b6c79c768804e8222c4e8e9d03403eda6490da70c8327ef479f3f690b82bfe0176c0847377051ff218976d39c3faa284d95f108d85a0bec48d394705 +SHA512 (SCSCP-2.4.3.tar.gz) = 4b8dd5d87967056a29463d234877308fd3f790583644464969b14db753a06afe403aabe0d5e6b80f7031f0ccc38894cc09579fb8ca8bf22ec89c65c7e5f838e6 From 5a9c9e8920eee4142d014b5162112cc2d8d557c8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Jul 2024 17:13:23 -0600 Subject: [PATCH 19/24] Minor spec file simplification --- gap-pkg-scscp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 2922cf5..7e634ac 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -24,7 +24,7 @@ Source6: server.g Source7: %{name}.sysusers # Fix a typo in makedoc.g. -Patch0: %{name}-makedoc.patch +Patch: %{name}-makedoc.patch BuildRequires: gap-devel BuildRequires: GAPDoc-latex From 4b60561b8a87fdf5071a4be9a2fb86bfe397ec07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 00:07:26 +0000 Subject: [PATCH 20/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4f6b62f28038c94eea504beddfe4f7586eebb6de Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 14 Jan 2025 10:01:10 -0700 Subject: [PATCH 21/24] Minor spec file cleanups --- gap-pkg-scscp.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 7e634ac..6f6c524 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -65,8 +65,6 @@ This package contains documentation for gap-pkg-%{pkgname}. %autosetup -p0 -n %{upname}-%{version} %build -export LC_ALL=C.UTF-8 - # Link to main GAP documentation ln -s %{gap_libdir}/doc ../../doc mkdir ../pkg @@ -105,8 +103,8 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir} # Install the man page mkdir -p %{buildroot}%{_mandir}/man8 -help2man -m "GAP SCSCP package" -S "GAP SCSCP (Fedora %{version}-%{release})" \ - -n "GAP Daemon" -I %{SOURCE5} -o %{buildroot}%{_mandir}/man8/%{usrname}.8 \ +help2man -m 'GAP SCSCP package' -S 'GAP SCSCP (Fedora %{version}-%{release})' \ + -n 'GAP Daemon' -I %{SOURCE5} -o %{buildroot}%{_mandir}/man8/%{usrname}.8 \ -N -s 8 %{SOURCE1} # Move the config files to their new home @@ -119,8 +117,6 @@ ln -s %{_sysconfdir}/scscp/gap/config.g %{buildroot}%{gap_libdir}/pkg/%{upname} ln -s %{_sysconfdir}/scscp/gap/configpar.g %{buildroot}%{gap_libdir}/pkg/%{upname} %check -export LC_ALL=C.UTF-8 - # We only run the offline test as the others require network access and two # servers to be setup and running. mkdir ../pkg @@ -145,10 +141,13 @@ rm -fr ../pkg %files %doc README.md todo.txt %license COPYING -%{gap_libdir}/pkg/%{upname}/ -%exclude %{gap_libdir}/pkg/%{upname}/demo/ -%exclude %{gap_libdir}/pkg/%{upname}/doc/ -%exclude %{gap_libdir}/pkg/%{upname}/example/ +%dir %{gap_libdir}/pkg/%{upname}/ +%{gap_libdir}/pkg/%{upname}/*.g +%{gap_libdir}/pkg/%{upname}/*.sh +%{gap_libdir}/pkg/%{upname}/lib/ +%{gap_libdir}/pkg/%{upname}/par/ +%{gap_libdir}/pkg/%{upname}/tracing/ +%{gap_libdir}/pkg/%{upname}/tst/ %{_mandir}/man8/%{usrname}.8* %{_sysusersdir}/%{usrname}.conf %{_unitdir}/gap-scscp.service From c058942bd5a11e218212de5466bab43059a8b941 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:24:24 +0000 Subject: [PATCH 22/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 90e611e1b7d0d877f1cb67fc07161d9ca6d6889e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 21:04:47 +0000 Subject: [PATCH 23/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 34ce805701ee52754f50fd311993dfaa3b373275 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 25 Sep 2025 12:07:51 -0600 Subject: [PATCH 24/24] Version 2.4.4 - Use the GAP declarative buildsystem --- gap-pkg-scscp.spec | 88 ++++++++++++++++++++-------------------------- sources | 2 +- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/gap-pkg-scscp.spec b/gap-pkg-scscp.spec index 6f6c524..5657ca9 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -1,20 +1,17 @@ -%global pkgname scscp -%global upname SCSCP -%global usrname gapd -%global giturl https://github.com/gap-packages/scscp +%global gap_pkgname scscp +%global gap_upname SCSCP +%global usrname gapd +%global giturl https://github.com/gap-packages/scscp -Name: gap-pkg-%{pkgname} -Version: 2.4.3 +Name: gap-pkg-%{gap_pkgname} +Version: 2.4.4 Release: %autorelease Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later -BuildArch: noarch -# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} URL: https://gap-packages.github.io/scscp/ VCS: git:%{giturl}.git -Source0: %{giturl}/releases/download/v%{version}/%{upname}-%{version}.tar.gz +Source0: %{giturl}/releases/download/v%{version}/%{gap_upname}-%{version}.tar.gz Source1: %{usrname}.sh Source2: gap-scscp.service Source3: %{usrname}.logrotate @@ -26,6 +23,12 @@ Source7: %{name}.sysusers # Fix a typo in makedoc.g. Patch: %{name}-makedoc.patch +BuildArch: noarch +BuildSystem: gap +BuildOption(build): --packagedirs .. +BuildOption(install): *.sh demo example lib par tracing tst +BuildOption(check): tst/testall.g + BuildRequires: gap-devel BuildRequires: GAPDoc-latex BuildRequires: gap-pkg-io-doc @@ -42,8 +45,8 @@ Requires: logrotate %description This package implements the Symbolic Computation Software Composability Protocol (SCSCP) for the GAP system in accordance with the SCSCP -specification, described at https://openmath.org/standard/scscp/, and -OpenMath dictionaries scscp1 and scscp2. +specification, described at https://openmath.org/standard/scscp/, and OpenMath +dictionaries scscp1 and scscp2. %package doc # The content is GPL-2.0-or-later. The remaining licenses cover the various @@ -59,28 +62,16 @@ Requires: gap-pkg-openmath-doc Requires: gap-pkg-smallgrp-doc %description doc -This package contains documentation for gap-pkg-%{pkgname}. +This package contains documentation for gap-pkg-%{gap_pkgname}. %prep -%autosetup -p0 -n %{upname}-%{version} +%autosetup -p0 -n %{gap_upname}-%{version} -%build -# Link to main GAP documentation -ln -s %{gap_libdir}/doc ../../doc -mkdir ../pkg -ln -s ../%{upname}-%{version} ../pkg/%{upname} -gap -l "$PWD/..;" makedoc.g -rm -fr ../../doc ../pkg - -%install -mkdir -p %{buildroot}%{gap_libdir}/pkg/%{upname}/doc -cp -a *.g *.sh demo example lib par tracing tst \ - %{buildroot}%{gap_libdir}/pkg/%{upname} -%gap_copy_docs -n %{upname} -cp -a doc/img %{buildroot}%{gap_libdir}/pkg/%{upname}/doc +%install -a +cp -a doc/img %{buildroot}%{gap_libdir}/pkg/%{gap_upname}/doc # Replace upstream's launcher script with our own. -install -p -m 0755 %{SOURCE1} %{buildroot}%{gap_libdir}/pkg/%{upname} +install -p -m 0755 %{SOURCE1} %{buildroot}%{gap_libdir}/pkg/%{gap_upname} # Make the daemon's home directory mkdir -p %{buildroot}%{_sharedstatedir}/%{usrname} @@ -110,24 +101,21 @@ help2man -m 'GAP SCSCP package' -S 'GAP SCSCP (Fedora %{version}-%{release})' \ # Move the config files to their new home mkdir -p %{buildroot}%{_sysconfdir}/scscp/gap install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/scscp/gap -mv %{buildroot}%{gap_libdir}/pkg/%{upname}/config.g \ - %{buildroot}%{gap_libdir}/pkg/%{upname}/configpar.g \ +mv %{buildroot}%{gap_libdir}/pkg/%{gap_upname}/config.g \ + %{buildroot}%{gap_libdir}/pkg/%{gap_upname}/configpar.g \ %{buildroot}%{_sysconfdir}/scscp/gap -ln -s %{_sysconfdir}/scscp/gap/config.g %{buildroot}%{gap_libdir}/pkg/%{upname} -ln -s %{_sysconfdir}/scscp/gap/configpar.g %{buildroot}%{gap_libdir}/pkg/%{upname} +ln -s %{_sysconfdir}/scscp/gap/config.g %{buildroot}%{gap_libdir}/pkg/%{gap_upname} +ln -s %{_sysconfdir}/scscp/gap/configpar.g %{buildroot}%{gap_libdir}/pkg/%{gap_upname} %check # We only run the offline test as the others require network access and two # servers to be setup and running. -mkdir ../pkg -ln -s ../%{upname}-%{version} ../pkg/%{upname} cd tst -gap -l "$PWD/../..;" << EOF +gap --packagedirs ../.. << EOF LoadPackage("scscp"); GAP_EXIT_CODE(Test("offline.tst", rec(compareFunction := "uptowhitespace") )); EOF cd - -rm -fr ../pkg %pre %sysusers_create_package %{usrname} %{SOURCE7} @@ -141,13 +129,13 @@ rm -fr ../pkg %files %doc README.md todo.txt %license COPYING -%dir %{gap_libdir}/pkg/%{upname}/ -%{gap_libdir}/pkg/%{upname}/*.g -%{gap_libdir}/pkg/%{upname}/*.sh -%{gap_libdir}/pkg/%{upname}/lib/ -%{gap_libdir}/pkg/%{upname}/par/ -%{gap_libdir}/pkg/%{upname}/tracing/ -%{gap_libdir}/pkg/%{upname}/tst/ +%dir %{gap_libdir}/pkg/%{gap_upname}/ +%{gap_libdir}/pkg/%{gap_upname}/*.g +%{gap_libdir}/pkg/%{gap_upname}/*.sh +%{gap_libdir}/pkg/%{gap_upname}/lib/ +%{gap_libdir}/pkg/%{gap_upname}/par/ +%{gap_libdir}/pkg/%{gap_upname}/tracing/ +%{gap_libdir}/pkg/%{gap_upname}/tst/ %{_mandir}/man8/%{usrname}.8* %{_sysusersdir}/%{usrname}.conf %{_unitdir}/gap-scscp.service @@ -161,12 +149,12 @@ rm -fr ../pkg %attr(755,%{usrname},%{usrname}) %{_sharedstatedir}/%{usrname}/ %files doc -%docdir %{gap_libdir}/pkg/%{upname}/demo/ -%docdir %{gap_libdir}/pkg/%{upname}/doc/ -%docdir %{gap_libdir}/pkg/%{upname}/example/ -%{gap_libdir}/pkg/%{upname}/demo/ -%{gap_libdir}/pkg/%{upname}/doc/ -%{gap_libdir}/pkg/%{upname}/example/ +%docdir %{gap_libdir}/pkg/%{gap_upname}/demo/ +%docdir %{gap_libdir}/pkg/%{gap_upname}/doc/ +%docdir %{gap_libdir}/pkg/%{gap_upname}/example/ +%{gap_libdir}/pkg/%{gap_upname}/demo/ +%{gap_libdir}/pkg/%{gap_upname}/doc/ +%{gap_libdir}/pkg/%{gap_upname}/example/ %changelog %autochangelog diff --git a/sources b/sources index 3a300fe..5b1d4d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SCSCP-2.4.3.tar.gz) = 4b8dd5d87967056a29463d234877308fd3f790583644464969b14db753a06afe403aabe0d5e6b80f7031f0ccc38894cc09579fb8ca8bf22ec89c65c7e5f838e6 +SHA512 (SCSCP-2.4.4.tar.gz) = 694d6f5e1e6b23748359e085dac4ca819a542f2a083cacd18473407f6e90403bd9c66da83699ac62748ae70afc18ff74ca166a02133dbe679332efdd45ad1dae