diff --git a/changelog b/changelog deleted file mode 100644 index 1c297e8..0000000 --- a/changelog +++ /dev/null @@ -1,99 +0,0 @@ -* 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 5657ca9..fd06561 100644 --- a/gap-pkg-scscp.spec +++ b/gap-pkg-scscp.spec @@ -1,17 +1,17 @@ -%global gap_pkgname scscp -%global gap_upname SCSCP -%global usrname gapd -%global giturl https://github.com/gap-packages/scscp +%global pkgname scscp +%global upname SCSCP +%global usrname gapd -Name: gap-pkg-%{gap_pkgname} -Version: 2.4.4 -Release: %autorelease +Name: gap-pkg-%{pkgname} +Version: 2.4.0 +Release: 1%{?dist} Summary: Symbolic Computation Software Composability Protocol in GAP License: GPL-2.0-or-later +BuildArch: noarch +ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch URL: https://gap-packages.github.io/scscp/ -VCS: git:%{giturl}.git -Source0: %{giturl}/releases/download/v%{version}/%{gap_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 @@ -21,13 +21,7 @@ Source6: server.g 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 +Patch0: %{name}-makedoc.patch BuildRequires: gap-devel BuildRequires: GAPDoc-latex @@ -35,18 +29,18 @@ 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} -Requires: gap-pkg-io Requires: gap-pkg-openmath 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 @@ -62,16 +56,30 @@ Requires: gap-pkg-openmath-doc Requires: gap-pkg-smallgrp-doc %description doc -This package contains documentation for gap-pkg-%{gap_pkgname}. +This package contains documentation for gap-pkg-%{pkgname}. %prep -%autosetup -p0 -n %{gap_upname}-%{version} +%autosetup -p0 -n %{upname}-%{version} -%install -a -cp -a doc/img %{buildroot}%{gap_libdir}/pkg/%{gap_upname}/doc +%build +export LC_ALL=C.UTF-8 + +# Link to main GAP documentation +ln -s %{gap_dir}/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 +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_libdir}/pkg/%{gap_upname} +install -p -m 0755 %{SOURCE1} %{buildroot}%{gap_dir}/pkg/%{upname} # Make the daemon's home directory mkdir -p %{buildroot}%{_sharedstatedir}/%{usrname} @@ -94,28 +102,33 @@ 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 mkdir -p %{buildroot}%{_sysconfdir}/scscp/gap install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/scscp/gap -mv %{buildroot}%{gap_libdir}/pkg/%{gap_upname}/config.g \ - %{buildroot}%{gap_libdir}/pkg/%{gap_upname}/configpar.g \ +mv %{buildroot}%{gap_dir}/pkg/%{upname}/config.g \ + %{buildroot}%{gap_dir}/pkg/%{upname}/configpar.g \ %{buildroot}%{_sysconfdir}/scscp/gap -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} +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 ../%{upname}-%{version} ../pkg/%{upname} cd tst -gap --packagedirs ../.. << EOF +gap -l "$PWD/../..;" << EOF LoadPackage("scscp"); GAP_EXIT_CODE(Test("offline.tst", rec(compareFunction := "uptowhitespace") )); EOF cd - +rm -fr ../pkg %pre %sysusers_create_package %{usrname} %{SOURCE7} @@ -129,13 +142,10 @@ cd - %files %doc README.md todo.txt %license COPYING -%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/ +%{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 @@ -149,12 +159,92 @@ cd - %attr(755,%{usrname},%{usrname}) %{_sharedstatedir}/%{usrname}/ %files doc -%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/ +%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 -%autochangelog +* 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/sources b/sources index 5b1d4d5..5557a4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SCSCP-2.4.4.tar.gz) = 694d6f5e1e6b23748359e085dac4ca819a542f2a083cacd18473407f6e90403bd9c66da83699ac62748ae70afc18ff74ca166a02133dbe679332efdd45ad1dae +SHA512 (SCSCP-2.4.0.tar.gz) = 2a1b44fffebe57c99b757168a24ef6c880b0d5783eb2845527a729011cba1ac1b0bc6c0e768151da10b03b4355330b7b5a7019177085abc51757b8f06c04f063