# HG changeset patch
# Node ID fa83f320d9c7
# Parent  71f0a1891d24
diff --git a/convey.yml b/convey.yml
--- a/convey.yml
+++ b/convey.yml
@@ -1,13 +1,10 @@
 environment:
-  - PACKAGECLOUD_REPO=experimental
-  - ARCH=amd64
   - BUILD_NUMBER
   - REPOSITORY=gplugin/builders
   - REGISTRY=docker.io
   - REGISTRY_USERNAME
   - REGISTRY_PASSWORD
-  - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bullseye-amd64
-  - DOCS_VERSION=latest
+  - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bookworm-amd64
 
 tasks:
   clean:
@@ -17,23 +14,21 @@
       - debian-bullseye-amd64
       - debian-bullseye-arm64
       - debian-bullseye-armhf
+      - debian-bookworm-amd64
       - dist
-      - elementary-juno-amd64
-      - fedora-31-amd64
-      - fedora-32-amd64
-      - fedora-33-amd64
+      - fedora-34-amd64
       - fedora-rawhide-amd64
-      - gplugin-docs
-      - gplugin-gtk-docs
       - i18n
       - mingw-w64-i686
       - mingw-w64-x86_64
       - opensuse-tumbleweed-amd64
       - pvs-studio
       - scanbuild
-      - ubuntu-focal-amd64
-      - ubuntu-groovy-amd64
+      - ubuntu-hirsute-amd64
       - valgrind
+      # docs
+      - gplugin-docs
+      - gplugin-gtk-docs
 
   import:
     type: docker/import
@@ -45,18 +40,10 @@
 
   build:
     type: docker/run
-    image: ${REGISTRY}/${REPOSITORY}:${DISTRO}-${VERSION}-${ARCH}
+    image: ${REGISTRY}/${REPOSITORY}:${TARGET}
 
   export:
     type: docker/export
-    files: ${DISTRO}-${VERSION}-${ARCH}
-
-  build-target:
-    type: docker/run
-    image: ${REGISTRY}/${REPOSITORY}:${TARGET}
-
-  export-target:
-    type: docker/export
     files: ${TARGET}
 
   login:
@@ -88,104 +75,73 @@
       - build-docs/gplugin/reference/html:gplugin-docs
       - build-docs/gplugin-gtk/reference/html:gplugin-gtk-docs
 
-  package-cloud:
-    type: docker/run
-    image: rwgrim/package_cloud:latest
-    environment:
-      - PACKAGECLOUD_TOKEN
-    command: push --yes --verbose pidgin/${PACKAGECLOUD_REPO}/${DISTRO}/${VERSION} ${PATTERN}
-    workdir: ${CONVEY_WORKSPACE}/${DISTRO}-${VERSION}-${ARCH}
-
-  publish-deb:
-    type: convey/extend
-    task: package-cloud
-    environment: [PATTERN=*.deb]
-
-  publish-debsrc:
-    type: convey/extend
-    task: package-cloud
-    environment: [PATTERN=*.dsc]
-
-  publish-rpm:
-    type: convey/extend
-    task: package-cloud
-    environment: [PATTERN=x86_64/*.rpm]
-
 plans:
   clean:
     stages:
       - tasks: clean
 
   alpine-edge-amd64:
-    environment: [DISTRO=alpine, VERSION=edge]
+    environment: TARGET=alpine-edge-amd64
     stages:
       - tasks: [import, build, export]
 
   clang-format:
-    environment: [TARGET=clang-format]
+    environment: TARGET=clang-format
     stages:
-      - tasks: [import, build-target]
+      - tasks: [import, build]
+
+  debian-bookworm-amd64:
+    environment: TARGET=debian-bookworm-amd64
+    stages:
+      - tasks: [import, build, export]
 
   debian-bullseye-amd64:
-    environment: [DISTRO=debian, VERSION=bullseye]
+    environment: TARGET=debian-bullseye-amd64
     stages:
       - tasks: [import, build, export]
   debian-bullseye-arm64:
-    environment: [DISTRO=debian, VERSION=bullseye, ARCH=arm64]
+    environment: TARGET=debian-bullseye-arm64
     stages:
       - tasks: [import, build, export]
   debian-bullseye-armhf:
-    environment: [DISTRO=debian, VERSION=bullseye, ARCH=armhf]
+    environment: TARGET=debian-bullseye-armhf
     stages:
       - tasks: [import, build, export]
 
   dist:
-    environment: [TARGET=dist]
+    environment: TARGET=dist
     stages:
-      - tasks: [import, build-target, export-target]
+      - tasks: [import, build, export]
 
   docs:
     stages:
       - tasks: [docs-clean, import, docs-build, docs-export]
 
-  elementary-juno-amd64:
-    environment: [DISTRO=elementary, VERSION=juno]
-    stages:
-      - tasks: [import, build, export]
-
-  fedora-31-amd64:
-    environment: [DISTRO=fedora, VERSION=31]
-    stages:
-      - tasks: [import, build, export]
-  fedora-32-amd64:
-    environment: [DISTRO=fedora, VERSION=32]
-    stages:
-      - tasks: [import, build, export]
-  fedora-33-amd64:
-    environment: [DISTRO=fedora, VERSION=33]
+  fedora-34-amd64:
+    environment: TARGET=fedora-34-amd64
     stages:
       - tasks: [import, build, export]
   fedora-rawhide-amd64:
-    environment: [DISTRO=fedora, VERSION=rawhide]
+    environment: TARGET=fedora-rawhide-amd64
     stages:
       - tasks: [import, build, export]
 
   i18n:
-    environment: [TARGET=i18n]
+    environment: TARGET=i18n
     stages:
-      - tasks: [import, build-target, export-target]
+      - tasks: [import, build, export]
 
   mingw-w64-i686:
-    environment: [DISTRO=mingw, VERSION=w64, ARCH=i686, PKGBUILD_DIR=mingw-cross]
+    environment: [TARGET=mingw-w64-i686, PKGBUILD_DIR=mingw-cross]
     stages:
       - tasks: [import, build, export]
   mingw-w64-x86_64:
-    environment: [DISTRO=mingw, VERSION=w64, ARCH=x86_64, PKGBUILD_DIR=mingw-cross]
+    environment: [TARGET=mingw-w64-x86_64, PKGBUILD_DIR=mingw-cross]
     stages:
       - tasks: [import, build, export]
 
   opensuse-tumbleweed-amd64:
-    environment: [DISTRO=opensuse, VERSION=tumbleweed]
+    environment: TARGET=opensuse-tumbleweed-amd64
     stages:
       - tasks: [import, build, export]
 
@@ -196,73 +152,47 @@
       - PVS_STUDIO_KEY
       - PVS_IGNORED_CODES=V568
     stages:
-      - tasks: [import, build-target]
-      - tasks: [export-target]
+      - tasks: [import, build]
+      - tasks: [export]
         run: always
 
   scanbuild:
-    environment: [TARGET=scanbuild]
+    environment: TARGET=scanbuild
     stages:
-      - tasks: [import, build-target]
-      - tasks: [export-target]
+      - tasks: [import, build]
+      - tasks: [export]
         run: always
 
   simple:
-    environment: [TARGET=simple]
+    environment: TARGET=simple
     stages:
-      - tasks: [import, build-target]
+      - tasks: [import, build]
 
-  ubuntu-focal-amd64:
-    environment: [DISTRO=ubuntu, VERSION=focal]
-    stages:
-      - tasks: [import, build, export]
-
-  ubuntu-groovy-amd64:
-    environment: [DISTRO=ubuntu, VERSION=groovy]
+  ubuntu-hirsute-amd64:
+    environment: TARGET=ubuntu-hirsute-amd64
     stages:
       - tasks: [import, build, export]
 
   valgrind:
-    environment: [TARGET=valgrind]
-    stages:
-      - tasks: [import, build-target]
-      - tasks: [export-target]
-        run: always
-
-  publish:
+    environment: TARGET=valgrind
     stages:
-      - environment:
-          - DISTRO=elementary
-          - VERSION=juno
-        tasks: [import-artifacts, publish-deb, publish-debsrc]
-      - environment:
-          - DISTRO=fedora
-          - VERSION=29
-        tasks: [import-artifacts, publish-rpm]
-      - environment:
-          - DISTRO=fedora
-          - VERSION=30
-        tasks: [import-artifacts, publish-rpm]
-      - environment:
-          - DISTRO=ubuntu
-          - VERSION=focal
-        tasks: [import-artifacts, publish-deb, publish-debsrc]
+      - tasks: [import, build]
+      - tasks: [export]
+        run: always
 
 meta-plans:
   all:
     plans:
       - alpine-edge-amd64
       - debian-bullseye-amd64
+      - debian-bookworm-amd64
       - dist
-      - fedora-31-amd64
-      - fedora-32-amd64
-      - fedora-33-amd64
+      - fedora-34-amd64
       - fedora-rawhide-amd64
       - mingw-w64-i686
       - mingw-w64-x86_64
       - opensuse-tumbleweed-amd64
-      - ubuntu-focal-amd64
-      - ubuntu-groovy-amd64
+      - ubuntu-hirsute-amd64
   tools:
     plans:
       - clang-format
diff --git a/packaging/gplugin.spec.in b/packaging/gplugin.spec.in
--- a/packaging/gplugin.spec.in
+++ b/packaging/gplugin.spec.in
@@ -15,7 +15,6 @@
 BuildRequires:	gobject-introspection-devel
 BuildRequires:	gettext
 BuildRequires:	gtk3-devel
-BuildRequires:	gtk-doc
 BuildRequires:	help2man
 BuildRequires:	libxslt
 BuildRequires:	lua-devel
@@ -184,7 +183,7 @@
 %license COPYING
 %{_datadir}/gplugin/
 %{_datadir}/gir-1.0/GPlugin-1.0.gir
-%{_datadir}/gtk-doc/html/gplugin/
+%{_datadir}/doc/gplugin/
 %{_includedir}/gplugin-1.0/
 %{_libdir}/girepository-1.0/GPlugin-1.0.typelib
 %{_libdir}/libgplugin.so
@@ -207,7 +206,7 @@
 %license COPYING
 %{_datadir}/gir-1.0/GPluginGtk-1.0.gir
 %{_datadir}/glade/catalogs/gplugin-gtk.xml
-%{_datadir}/gtk-doc/html/gplugin-gtk/
+%{_datadir}/doc/gplugin-gtk/
 %{_libdir}/girepository-1.0/GPluginGtk-1.0.typelib
 %{_libdir}/libgplugin-gtk.so
 %{_libdir}/libgplugin-gtk.so.0
@@ -245,6 +244,9 @@
 %{_datadir}/vala/vapi/gplugin.deps
 
 %changelog
+* Thu Sep 02 2021 Gary Kramlich <grim@reaperworld.com>
+- Update the devel packages for gi-docgen
+
 * Tue Aug 25 2020 Gary Kramlich <grim@reaperworld.com>
 - Updated the perl packages for its new name.
 
