diff --git a/pandoc-version-disable-hslua.patch b/pandoc-version-disable-hslua.patch deleted file mode 100644 index f9594cd..0000000 --- a/pandoc-version-disable-hslua.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- pandoc-2.19.2/src/Text/Pandoc/App/CommandLineOptions.hs~ 2001-09-09 09:46:40.000000000 +0800 -+++ pandoc-2.19.2/src/Text/Pandoc/App/CommandLineOptions.hs 2023-03-13 20:14:12.911386007 +0800 -@@ -969,14 +969,15 @@ - (\_ -> do - prg <- getProgName - defaultDatadir <- defaultUserDataDir -- luaVersion <- HsLua.run @HsLua.Exception $ do -- openlibs -- getglobal "_VERSION" -- peek top -+ -- luaVersion <- HsLua.run @HsLua.Exception $ do -+ -- openlibs -+ -- getglobal "_VERSION" -+ -- peek top - UTF8.hPutStrLn stdout - $ T.pack - $ prg ++ " " ++ T.unpack pandocVersion ++ versionSuffix ++ -- compileInfo ++ "\nScripting engine: " ++ luaVersion ++ -+ compileInfo ++ -+ -- "\nScripting engine: " ++ luaVersion ++ - "\nUser data directory: " ++ defaultDatadir ++ - ('\n':copyrightMessage) - exitSuccess )) diff --git a/pandoc.spec b/pandoc.spec index ac8164c..7941e45 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -56,7 +56,6 @@ Source16: https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandoc Source17: https://hackage.haskell.org/package/%{hslualist}/%{hslualist}.tar.gz # End cabal-rpm sources Source18: https://hackage.haskell.org/package/%{base64}/base64.cabal#/%{base64}.cabal -Patch0: pandoc-version-disable-hslua.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -368,9 +367,6 @@ or texlive-collection-luatex respectively. # Begin cabal-rpm setup: %setup -q -n %{pandoccli} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 # End cabal-rpm setup -%ifarch ppc64le -%patch -P0 -p1 -b .orig -%endif cp -p %{SOURCE18} %{base64}/base64.cabal