diff --git a/ghc-pandoc.spec b/ghc-pandoc.spec index e13f7a5e8a9eff1da4f756e0d8ab814e516bb0b8..76cb71b9a344f15e7e6f1641f0484db88d9b5ac7 100644 --- a/ghc-pandoc.spec +++ b/ghc-pandoc.spec @@ -3,8 +3,8 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.9 -Release: 3 +Version: 3.7.0.1 +Release: 1 Summary: Conversion between markup formats License: GPL-2.0-or-later URL: https://hackage.haskell.org/package/%{pkg_name} @@ -14,8 +14,6 @@ BuildRequires: ghc-Glob-devel BuildRequires: ghc-Glob-prof BuildRequires: ghc-JuicyPixels-devel BuildRequires: ghc-JuicyPixels-prof -BuildRequires: ghc-SHA-devel -BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-devel BuildRequires: ghc-aeson-pretty-devel BuildRequires: ghc-aeson-pretty-prof @@ -26,8 +24,8 @@ BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-devel BuildRequires: ghc-base-prof -BuildRequires: ghc-base64-devel -BuildRequires: ghc-base64-prof +BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-devel BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-devel @@ -50,12 +48,18 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-containers-prof BuildRequires: ghc-crypton-connection-devel BuildRequires: ghc-crypton-connection-prof +BuildRequires: ghc-crypton-devel +BuildRequires: ghc-crypton-prof +BuildRequires: ghc-crypton-x509-system-devel +BuildRequires: ghc-crypton-x509-system-prof BuildRequires: ghc-data-default-devel BuildRequires: ghc-data-default-prof BuildRequires: ghc-deepseq-devel BuildRequires: ghc-deepseq-prof BuildRequires: ghc-directory-devel BuildRequires: ghc-directory-prof +BuildRequires: ghc-djot-devel +BuildRequires: ghc-djot-prof BuildRequires: ghc-doclayout-devel BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-devel @@ -82,6 +86,8 @@ BuildRequires: ghc-ipynb-devel BuildRequires: ghc-ipynb-prof BuildRequires: ghc-jira-wiki-markup-devel BuildRequires: ghc-jira-wiki-markup-prof +BuildRequires: ghc-libyaml-devel +BuildRequires: ghc-libyaml-prof BuildRequires: ghc-mime-types-devel BuildRequires: ghc-mime-types-prof BuildRequires: ghc-mtl-devel @@ -127,6 +133,8 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-text-prof BuildRequires: ghc-time-devel BuildRequires: ghc-time-prof +BuildRequires: ghc-tls-devel +BuildRequires: ghc-tls-prof BuildRequires: ghc-typst-devel BuildRequires: ghc-typst-prof BuildRequires: ghc-unicode-collation-devel @@ -197,6 +205,7 @@ This package provides the Haskell %{pkg_name} library development files. %package -n ghc-%{pkg_name}-help Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem BuildArch: noarch %description -n ghc-%{pkg_name}-help @@ -214,20 +223,7 @@ This package provides the Haskell %{pkg_name} profiling library. %autosetup -n %{pkg_name}-%{version} %build -%ghc_fix_doc_perms -%{?!ghc_debuginfo:%global debug_package %{nil}} -%cabal_configure %{?with_ghc_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_ghclicensedir}/ghc-%1${licensedirversion} --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} -until %cabal build %{?ghc_smp_mflags} %{?cabal_build_options} -do - echo "Build failed, retrying..." -done -%if %{with haddock} -%define pkgname %{?1}%{!?1:%{pkg_name}} -%define pkgver %{?2}%{!?2:%{version}} -if [ -n dist/build/libHS%{pkgname}-%{pkgver}*.so ]; then -%cabal haddock --html --hyperlink-source --hoogle %{?cabal_haddock_options} -fi -%endif +%ghc_lib_build %install %ghc_lib_install @@ -357,13 +353,18 @@ fi %{_datadir}/%{pkg_name}-%{version}/data/pptx/ppt/theme/theme2.xml %{_datadir}/%{pkg_name}-%{version}/data/pptx/ppt/viewProps.xml %{_datadir}/%{pkg_name}-%{version}/data/templates/affiliations.jats +%{_datadir}/%{pkg_name}-%{version}/data/templates/after-header-includes.latex %{_datadir}/%{pkg_name}-%{version}/data/templates/article.jats_publishing +%{_datadir}/%{pkg_name}-%{version}/data/templates/common.latex +%{_datadir}/%{pkg_name}-%{version}/data/templates/default.ansi %{_datadir}/%{pkg_name}-%{version}/data/templates/default.asciidoc +%{_datadir}/%{pkg_name}-%{version}/data/templates/default.beamer %{_datadir}/%{pkg_name}-%{version}/data/templates/default.biblatex %{_datadir}/%{pkg_name}-%{version}/data/templates/default.bibtex %{_datadir}/%{pkg_name}-%{version}/data/templates/default.chunkedhtml %{_datadir}/%{pkg_name}-%{version}/data/templates/default.commonmark %{_datadir}/%{pkg_name}-%{version}/data/templates/default.context +%{_datadir}/%{pkg_name}-%{version}/data/templates/default.djot %{_datadir}/%{pkg_name}-%{version}/data/templates/default.docbook4 %{_datadir}/%{pkg_name}-%{version}/data/templates/default.docbook5 %{_datadir}/%{pkg_name}-%{version}/data/templates/default.dokuwiki @@ -386,6 +387,7 @@ fi %{_datadir}/%{pkg_name}-%{version}/data/templates/default.ms %{_datadir}/%{pkg_name}-%{version}/data/templates/default.muse %{_datadir}/%{pkg_name}-%{version}/data/templates/default.opendocument +%{_datadir}/%{pkg_name}-%{version}/data/templates/default.openxml %{_datadir}/%{pkg_name}-%{version}/data/templates/default.opml %{_datadir}/%{pkg_name}-%{version}/data/templates/default.org %{_datadir}/%{pkg_name}-%{version}/data/templates/default.plain @@ -401,7 +403,10 @@ fi %{_datadir}/%{pkg_name}-%{version}/data/templates/default.typst %{_datadir}/%{pkg_name}-%{version}/data/templates/default.xwiki %{_datadir}/%{pkg_name}-%{version}/data/templates/default.zimwiki -%{_datadir}/%{pkg_name}-%{version}/data/templates/definitions.typst +%{_datadir}/%{pkg_name}-%{version}/data/templates/font-settings.latex +%{_datadir}/%{pkg_name}-%{version}/data/templates/fonts.latex +%{_datadir}/%{pkg_name}-%{version}/data/templates/hypersetup.latex +%{_datadir}/%{pkg_name}-%{version}/data/templates/passoptions.latex %{_datadir}/%{pkg_name}-%{version}/data/templates/styles.citations.html %{_datadir}/%{pkg_name}-%{version}/data/templates/styles.html %{_datadir}/%{pkg_name}-%{version}/data/templates/template.typst @@ -416,6 +421,10 @@ fi %files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files %changelog +* Tue May 27 2025 Lin Runze 3.7.0.1-1 +- Update to 3.7.0.1 +- Drop retrying logic. + * Tue Nov 26 2024 Lin Runze 3.1.9-3 - Replace _enable_debug_packages with debug_package diff --git a/pandoc-3.1.9.tar.gz b/pandoc-3.7.0.1.tar.gz similarity index 48% rename from pandoc-3.1.9.tar.gz rename to pandoc-3.7.0.1.tar.gz index 8b4e4719981006605556cccfcf17f8cafde2ddfb..cb24215e5f4fa2c75fc5d7ad5f40cffc975e9073 100644 Binary files a/pandoc-3.1.9.tar.gz and b/pandoc-3.7.0.1.tar.gz differ