diff --git a/citeproc-0.7.tar.gz b/citeproc-0.7.tar.gz
deleted file mode 100644
index 3c448bf..0000000
--- a/citeproc-0.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:091a8adde94b3699125d63c5a284605df27bac9b4ee1a0ef6411dc06cdd74ef7
-size 528208
diff --git a/citeproc-0.8.0.2.tar.gz b/citeproc-0.8.0.2.tar.gz
new file mode 100644
index 0000000..6faeb8c
--- /dev/null
+++ b/citeproc-0.8.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc4b30ca58d8e312d4114ddfd6dcfaa19a5693765d3cfd006907d6f7da364ae6
+size 540428
diff --git a/citeproc.cabal b/citeproc.cabal
deleted file mode 100644
index fbda2c8..0000000
--- a/citeproc.cabal
+++ /dev/null
@@ -1,175 +0,0 @@
-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 c6e791b..6f28bcb 100644
--- a/ghc-citeproc.changes
+++ b/ghc-citeproc.changes
@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Thu Oct 6 02:54:13 UTC 2022 - Peter Simons
+
+- Update citeproc to version 0.8.0.2.
+ ## 0.8.0.2
+
+ * Fix missing locator after collapsing and grouping with year
+ suffix (#96).
+
+ ## 0.8.0.1
+
+ * Fix disambiguation edge case (#116). We weren't properly
+ disambiguating when only one of two ambiguous names had a
+ subsequent citation.
+
+ * Chicago page numbering fixes.
+
+ * Update test suite form upstream.
+
+ * Handle whole-citation links differently in `secondFieldAlign` (#113,
+ Benjamin Bray).
+
+ * Require data-default >= 0.5.2 (#114, Bodigrim).
+
+ ## 0.8
+
+ * Add `SubstitutedVal` constructor for `Val` [API change] (#101, #108).
+ This is used to track variables that are repressed due to substitution.
+ (We can't just delete them, because they still count when we have
+ "if" elements that check for a variable.)
+
+ * Fix logic for including a group. A group with a text node and an
+ empty variable should count as empty.
+
+ * CaseTransform: don't change words that are a mix of uppercase
+ and nonletters, like CRT1000.
+
+ * Fix label with "page" variable (#107).
+
+ * Fix error in test suite. We stripped indentation in the expected result
+ in some cases.
+
+ * Update fr-FR locale from upstream.
+
-------------------------------------------------------------------
Fri Jul 15 19:16:54 UTC 2022 - Peter Simons
diff --git a/ghc-citeproc.spec b/ghc-citeproc.spec
index a7712f7..2bc21d1 100644
--- a/ghc-citeproc.spec
+++ b/ghc-citeproc.spec
@@ -19,13 +19,12 @@
%global pkg_name citeproc
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.7
+Version: 0.8.0.2
Release: 0
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
@@ -71,7 +70,6 @@ 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