From 6dc8c1a63d76170d7cbfc59f709e00a7606dd4b05ff9893523e1be3b096b5128 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 29 Jun 2022 12:18:09 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-citeproc revision:31, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-citeproc?expand=0&rev=32 --- citeproc-0.6.0.1.tar.gz | 3 --- citeproc-0.7.tar.gz | 3 +++ ghc-citeproc.changes | 24 ++++++++++++++++++++++++ ghc-citeproc.spec | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 citeproc-0.6.0.1.tar.gz create mode 100644 citeproc-0.7.tar.gz diff --git a/citeproc-0.6.0.1.tar.gz b/citeproc-0.6.0.1.tar.gz deleted file mode 100644 index 9fb3011..0000000 --- a/citeproc-0.6.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c2f0090d7e71069e26a8416e26170842d11ba3b2508fd21d0201c35b0b6aa04 -size 588162 diff --git a/citeproc-0.7.tar.gz b/citeproc-0.7.tar.gz new file mode 100644 index 0000000..3c448bf --- /dev/null +++ b/citeproc-0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:091a8adde94b3699125d63c5a284605df27bac9b4ee1a0ef6411dc06cdd74ef7 +size 528208 diff --git a/ghc-citeproc.changes b/ghc-citeproc.changes index f132656..af66236 100644 --- a/ghc-citeproc.changes +++ b/ghc-citeproc.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Apr 2 20:31:55 UTC 2022 - Peter Simons + +- Update citeproc to version 0.7. + ## 0.7 + + * Handle old term form `sub verbo` as if it is `sub-verbo` (the new form). + + * Update to latest locales in CSL repository. + + * Makefile: Fix update-locales target. + + * Keep explicit "et al." (#102, Albert Krewinkel). + + * Factor out `deleteSubstitutedVariables`. + + * Add any references in `citationItemData` to references. + + * Add `citationItemData` field to `CitationItem` [API change]. + This corresponds to the `itemData` that can appear + in the JSON representation of a citation item. + + * Add Ord, Eq instances for `Reference`, `DisambiguationData`, `Val` [API change]. + ------------------------------------------------------------------- Wed Jan 12 07:51:24 UTC 2022 - Peter Simons diff --git a/ghc-citeproc.spec b/ghc-citeproc.spec index e505812..9567632 100644 --- a/ghc-citeproc.spec +++ b/ghc-citeproc.spec @@ -19,7 +19,7 @@ %global pkg_name citeproc %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.0.1 +Version: 0.7 Release: 0 Summary: Generates citations and bibliography from CSL styles License: BSD-2-Clause From 7228facfd7fb0c21ad24c0ba769e4aab5e781b36278cce31c153ea12ad847acf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 17 Jul 2022 10:32:39 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-citeproc revision:32, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-citeproc?expand=0&rev=33 --- citeproc.cabal | 175 +++++++++++++++++++++++++++++++++++++++++++ ghc-citeproc.changes | 6 ++ ghc-citeproc.spec | 2 + 3 files changed, 183 insertions(+) create mode 100644 citeproc.cabal diff --git a/citeproc.cabal b/citeproc.cabal new file mode 100644 index 0000000..fbda2c8 --- /dev/null +++ b/citeproc.cabal @@ -0,0 +1,175 @@ +cabal-version: 2.2 +name: citeproc +version: 0.7 +x-revision: 1 +synopsis: Generates citations and bibliography from CSL styles. +description: citeproc parses CSL style files and uses them to + generate a list of formatted citations and bibliography + entries. For more information about CSL, see + . +license: BSD-2-Clause +license-file: LICENSE +author: John MacFarlane +maintainer: jgm@berkeley.edu +copyright: 2020 John MacFarlane +category: Text +build-type: Simple +extra-doc-files: README.md + , CHANGELOG.md +extra-source-files: stack.yaml + cabal.project + locales/*.xml + locales/locales.json + man/citeproc.1.md + man/citeproc.1 + test/NOTES.md + test/csl/*.txt + test/extra/*.txt + test/overrides/*.txt +tested-with: GHC == 8.0.2, GHC == 8.2.2, + GHC == 8.4.4, GHC == 8.6.5, + GHC == 8.8.4, GHC == 8.10.7, + GHC == 9.0.2, GHC == 9.2.2 + +source-repository head + type: git + location: https://github.com/jgm/citeproc.git + +flag icu + description: Use Haskell bindings to the ICU library + default: False + +flag executable + description: Build citeproc executable + default: False + +common hie-options + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie + +library + import: hie-options + hs-source-dirs: src + exposed-modules: Citeproc + Citeproc.Types + Citeproc.Locale + Citeproc.Style + Citeproc.CslJson + Citeproc.Pandoc + Citeproc.Eval + Citeproc.CaseTransform + other-modules: Citeproc.Element + Citeproc.Data + Citeproc.Unicode + + build-depends: base >= 4.8 && < 5 + , safe + , bytestring + , text + , containers >= 0.6.0.1 && < 0.7 + , transformers >= 0.5.6 && < 0.7 + , case-insensitive >= 1.2 && < 1.3 + , vector + , scientific + , uniplate + , xml-conduit + , attoparsec + , data-default >= 0.5.2 + , aeson + , filepath + , file-embed + , pandoc-types >= 1.22 && < 1.23 + , unicode-collation >= 0.1.3 && < 0.2 + -- , pretty-show + if flag(icu) + build-depends: text-icu >= 0.7.1.0 + + ghc-options: -Wall + -Wincomplete-record-updates + -Wcompat + -Widentities + -Wredundant-constraints + + if impl(ghc >= 8.2) + ghc-options: -Wcpp-undef + if impl(ghc >= 8.4) + ghc-options: -Wincomplete-uni-patterns + -Widentities + -Werror=missing-home-modules + -fhide-source-paths + + if impl(ghc < 8.8) + build-depends: base-compat >= 0.10 + hs-source-dirs: prelude + other-modules: Prelude + + default-language: Haskell2010 + +executable citeproc + import: hie-options + hs-source-dirs: app + main-is: Main.hs + build-depends: base >= 4.8 && < 5 + , citeproc + , bytestring + , text + , aeson + , aeson-pretty + + ghc-options: -Wall + -Wincomplete-record-updates + -Wcompat + -Widentities + -Wredundant-constraints + -optP-Wno-nonportable-include-path + if impl(ghc >= 8.2) + ghc-options: -Wcpp-undef + if impl(ghc >= 8.4) + ghc-options: -Wincomplete-uni-patterns + -Widentities + -fhide-source-paths + default-language: Haskell2010 + if flag(executable) + buildable: True + else + buildable: False + +test-suite spec + import: hie-options + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Spec.hs + + build-depends: base >= 4.8 && < 5 + , citeproc + , bytestring + , text + , containers + , directory + , transformers + , mtl + , timeit + , Diff >= 0.4 + , pretty + , filepath + , aeson + + + ghc-options: -Wall + -threaded + -rtsopts + -with-rtsopts=-N + -Wincomplete-record-updates + -Wcompat + -Widentities + -Wredundant-constraints + if impl(ghc >= 8.2) + ghc-options: -Wcpp-undef + if impl(ghc >= 8.4) + ghc-options: -Wincomplete-uni-patterns + -Widentities + -Werror=missing-home-modules + -fhide-source-paths + + default-language: Haskell2010 + diff --git a/ghc-citeproc.changes b/ghc-citeproc.changes index af66236..c6e791b 100644 --- a/ghc-citeproc.changes +++ b/ghc-citeproc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 15 19:16:54 UTC 2022 - Peter Simons + +- Update citeproc to version 0.7 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Sat Apr 2 20:31:55 UTC 2022 - Peter Simons diff --git a/ghc-citeproc.spec b/ghc-citeproc.spec index 9567632..a7712f7 100644 --- a/ghc-citeproc.spec +++ b/ghc-citeproc.spec @@ -25,6 +25,7 @@ Summary: Generates citations and bibliography from CSL styles License: BSD-2-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-attoparsec-devel @@ -70,6 +71,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build