Compare commits
2 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| be42784c96 | |||
| 058f7ff1fa |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b0b09e1fd74b11e76cd527c1ece9383a34560e57513df76a4cc1fbe2e8df93a8
|
||||
size 1285467
|
||||
3
form-4.3.1.tar.gz
Normal file
3
form-4.3.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c32bb45e3c52ecdfe1ea5bf8cca289bb5e9c7841af24eb971a3f30d886ac60b7
|
||||
size 1288306
|
||||
40
form-build-docs-without-git-repo.patch
Normal file
40
form-build-docs-without-git-repo.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
From 5c01278accf52cb4ef9f164ce3b5c0aca08c3f16 Mon Sep 17 00:00:00 2001
|
||||
From: Takahiro Ueda <t.ueda.od@juntendo.ac.jp>
|
||||
Date: Tue, 9 Apr 2024 21:09:35 +0900
|
||||
Subject: [PATCH] docs: building documents without repository (#497)
|
||||
|
||||
Avoid typesetting errors even when there is no revision information from
|
||||
the repository. The absence of revision information is indicated by
|
||||
"???" appended to the version number shown on the title page of the
|
||||
documents.
|
||||
---
|
||||
doc/devref/devref.tex.in | 2 +-
|
||||
doc/manual/manual.tex.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/doc/devref/devref.tex.in b/doc/devref/devref.tex.in
|
||||
index 34f22150..f63f4603 100644
|
||||
--- a/doc/devref/devref.tex.in
|
||||
+++ b/doc/devref/devref.tex.in
|
||||
@@ -2,7 +2,7 @@
|
||||
\def\formversiondesc{\repoversiondesc}
|
||||
\def\formdate{\repodate}
|
||||
%begin{latexonly} % To avoid latex2html/latex2html#37
|
||||
-\providecommand{\formversiondesc}{@VERSION@}
|
||||
+\providecommand{\repoversiondesc}{@VERSION@???}
|
||||
\providecommand{\repodate}{\today}
|
||||
%end{latexonly}
|
||||
|
||||
diff --git a/doc/manual/manual.tex.in b/doc/manual/manual.tex.in
|
||||
index 4aa1a69c..17b5bba8 100644
|
||||
--- a/doc/manual/manual.tex.in
|
||||
+++ b/doc/manual/manual.tex.in
|
||||
@@ -4,7 +4,7 @@
|
||||
\def\formversiondesc{\repoversiondesc}
|
||||
\def\formdate{\repodate}
|
||||
%begin{latexonly} % To avoid latex2html/latex2html#37
|
||||
-\providecommand{\formversiondesc}{@VERSION@}
|
||||
+\providecommand{\repoversiondesc}{@VERSION@???}
|
||||
\providecommand{\repodate}{\today}
|
||||
%end{latexonly}
|
||||
|
||||
56
form-fix-doxygen-failure.patch
Normal file
56
form-fix-doxygen-failure.patch
Normal file
@@ -0,0 +1,56 @@
|
||||
From 6531a2529d04aaa4a40dd8e312fb3c728ba632ff Mon Sep 17 00:00:00 2001
|
||||
From: Takahiro Ueda <t.ueda.od@juntendo.ac.jp>
|
||||
Date: Sat, 4 Nov 2023 15:42:44 +0900
|
||||
Subject: [PATCH] build(doxygen): fix Doxygen failure in case of tarballs
|
||||
(#462)
|
||||
|
||||
- The version information file for Doxygen (version.sh.in) should be put
|
||||
into a tarball even when Doxygen is unavailable in the system where
|
||||
the tarball is created.
|
||||
|
||||
- version.sh is not needed for a tarball (version.sh.in is).
|
||||
|
||||
- The fallback in the absence of version information in configure.ac
|
||||
must also consider version.sh.in.
|
||||
|
||||
Close #462.
|
||||
---
|
||||
configure.ac | 1 +
|
||||
doc/doxygen/Makefile.am | 8 +++-----
|
||||
2 files changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 06db3a44..84c630df 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -25,6 +25,7 @@ m4_define([FORM_VERSION], m4_esyscmd_s([
|
||||
echo '\\def\\repomajorversion'"{$major_version}" >doc/manual/version.tex.in
|
||||
echo '\\def\\repominorversion'"{$minor_version}" >>doc/manual/version.tex.in
|
||||
cp doc/manual/version.tex.in doc/devref/version.tex.in
|
||||
+ touch doc/doxygen/version.sh.in
|
||||
fi
|
||||
cat <<END >&2
|
||||
========================================================================
|
||||
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
|
||||
index adc1bbae..c40312c3 100644
|
||||
--- a/doc/doxygen/Makefile.am
|
||||
+++ b/doc/doxygen/Makefile.am
|
||||
@@ -1,8 +1,3 @@
|
||||
-######################################## CONFIG_DOXYGEN
|
||||
-if CONFIG_DOXYGEN
|
||||
-
|
||||
-EXTRA_DIST = version.sh
|
||||
-
|
||||
.PHONY: update_version
|
||||
|
||||
# Automatic versioning.
|
||||
@@ -31,6 +26,9 @@ DISTHOOK_VERSION = \
|
||||
|
||||
endif
|
||||
|
||||
+######################################## CONFIG_DOXYGEN
|
||||
+if CONFIG_DOXYGEN
|
||||
+
|
||||
RUN_DOXYGEN = source ./version.sh && PROJECT_NUMBER=$$repo_version_desc ${DOXYGEN}
|
||||
|
||||
# HTML
|
||||
18
form.changes
18
form.changes
@@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 7 09:30:59 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 4.3.1:
|
||||
* Fixed build errors on 32-bit machines
|
||||
(gh#vermaseren/form#422).
|
||||
* Fixed integer overflows in moebius_ with large numbers
|
||||
(gh#vermaseren/form#430).
|
||||
* Fixed possible memory errors in expanding user-defined
|
||||
preprocessor macros (gh#vermaseren/form#434).
|
||||
* Fixed an extremely rare bug in the long division with GMP
|
||||
(gh#vermaseren/form#439).
|
||||
- Add patches from upstream to fix building documentation:
|
||||
* form-build-docs-without-git-repo.patch (gh#form-dev/form#497).
|
||||
* form-fix-doxygen-failure.patch (gh#form-dev/form#467).
|
||||
- Make doc package noarch.
|
||||
- Add a %check section and run `make check`.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 27 05:26:25 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
27
form.spec
27
form.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package form
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,17 +17,20 @@
|
||||
|
||||
|
||||
%bcond_without doc
|
||||
|
||||
Name: form
|
||||
Version: 4.3.0
|
||||
Version: 4.3.1
|
||||
Release: 0
|
||||
Summary: A Symbolic Manipulation System
|
||||
License: GPL-3.0-or-later
|
||||
Group: Productivity/Scientific/Math
|
||||
URL: https://github.com/vermaseren/form/
|
||||
Source0: https://github.com/vermaseren/form/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
URL: https://github.com/form-dev/form/
|
||||
Source0: https://github.com/form-dev/form/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# PATCH-FEATURE-OPENSUSE form-dont-use-DATE.patch badshah400@gmail.com -- Do not use __DATE__ in source code to avoid issues with reproducibility
|
||||
Patch0: form-dont-use-DATE.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: https://github.com/form-dev/form/commit/5c01278accf52cb4ef9f164ce3b5c0aca08c3f16.patch#/form-build-docs-without-git-repo.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch2: https://github.com/form-dev/form/commit/6531a2529d04aaa4a40dd8e312fb3c728ba632ff.patch#/form-fix-doxygen-failure.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: doxygen
|
||||
@@ -39,6 +42,8 @@ BuildRequires: libtool
|
||||
BuildRequires: openmpi-macros-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
Recommends: %{name}-doc = %{version}
|
||||
%{openmpi_requires}
|
||||
%if %{with doc}
|
||||
BuildRequires: texlive-tex4ht
|
||||
BuildRequires: tex(adjustbox.sty)
|
||||
@@ -65,11 +70,7 @@ BuildRequires: tex(tocloft.sty)
|
||||
BuildRequires: tex(wasysym.sty)
|
||||
BuildRequires: tex(xcolor.sty)
|
||||
%endif
|
||||
Recommends: %{name}-doc = %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# i586 compilation errors need to be investigated, disable for now
|
||||
ExcludeArch: %ix86
|
||||
%openmpi_requires
|
||||
|
||||
%description
|
||||
FORM is a Symbolic Manipulation System. It reads symbolic expressions from files
|
||||
@@ -95,7 +96,7 @@ This package provides additional documentation for %{name}.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%setup_openmpi
|
||||
%{setup_openmpi}
|
||||
|
||||
sed -i "s|-march=native||g" configure.ac
|
||||
|
||||
@@ -116,6 +117,9 @@ autoreconf -fvi
|
||||
|
||||
%fdupes -s doc
|
||||
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS README.md
|
||||
@@ -126,11 +130,10 @@ autoreconf -fvi
|
||||
%{_bindir}/form
|
||||
%{_bindir}/tform
|
||||
%{_bindir}/parform
|
||||
%{_mandir}/man1/form.1%{ext_man}
|
||||
%{_mandir}/man1/form.1%{?ext_man}
|
||||
|
||||
%if %{with doc}
|
||||
%files doc
|
||||
%doc doc/doxygen/html/
|
||||
%doc doc/devref/devref.pdf
|
||||
%doc doc/devref/html/
|
||||
%endif
|
||||
|
||||
Reference in New Issue
Block a user