--- a/convey.yml Mon Aug 30 02:24:49 2021 -0500
+++ b/convey.yml Sun Sep 05 10:36:13 2021 -0500
@@ -1,13 +1,10 @@
- - PACKAGECLOUD_REPO=experimental
- REPOSITORY=gplugin/builders
- - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bullseye-amd64
+ - DOCS_BUILD_IMAGE=${REGISTRY}/${REPOSITORY}:debian-bookworm-amd64 @@ -17,23 +14,21 @@
+ - debian-bookworm-amd64 - - elementary-juno-amd64
- opensuse-tumbleweed-amd64
@@ -45,18 +40,10 @@
- image: ${REGISTRY}/${REPOSITORY}:${DISTRO}-${VERSION}-${ARCH}
+ image: ${REGISTRY}/${REPOSITORY}:${TARGET} - files: ${DISTRO}-${VERSION}-${ARCH}
- image: ${REGISTRY}/${REPOSITORY}:${TARGET}
@@ -88,104 +75,73 @@
- build-docs/gplugin/reference/gplugin:gplugin-docs
- build-docs/gplugin-gtk/reference/gplugin-gtk:gplugin-gtk-docs
- image: rwgrim/package_cloud:latest
- command: push --yes --verbose pidgin/${PACKAGECLOUD_REPO}/${DISTRO}/${VERSION} ${PATTERN}
- workdir: ${CONVEY_WORKSPACE}/${DISTRO}-${VERSION}-${ARCH}
- environment: [PATTERN=*.deb]
- environment: [PATTERN=*.dsc]
- environment: [PATTERN=x86_64/*.rpm]
- environment: [DISTRO=alpine, VERSION=edge]
+ environment: TARGET=alpine-edge-amd64 - tasks: [import, build, export]
- environment: [TARGET=clang-format]
+ environment: TARGET=clang-format - - tasks: [import, build-target]
+ - tasks: [import, build] + environment: TARGET=debian-bookworm-amd64 + - tasks: [import, build, export] - environment: [DISTRO=debian, VERSION=bullseye]
+ environment: TARGET=debian-bullseye-amd64 - tasks: [import, build, export]
- environment: [DISTRO=debian, VERSION=bullseye, ARCH=arm64]
+ environment: TARGET=debian-bullseye-arm64 - tasks: [import, build, export]
- environment: [DISTRO=debian, VERSION=bullseye, ARCH=armhf]
+ environment: TARGET=debian-bullseye-armhf - tasks: [import, build, export]
- environment: [TARGET=dist]
+ environment: TARGET=dist - - tasks: [import, build-target, export-target]
+ - tasks: [import, build, export] - tasks: [docs-clean, import, docs-build, docs-export]
- environment: [DISTRO=elementary, VERSION=juno]
- - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=31]
- - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=32]
- - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=33]
+ environment: TARGET=fedora-34-amd64 - tasks: [import, build, export]
- environment: [DISTRO=fedora, VERSION=rawhide]
+ environment: TARGET=fedora-rawhide-amd64 - tasks: [import, build, export]
- environment: [TARGET=i18n]
+ environment: TARGET=i18n - - tasks: [import, build-target, export-target]
+ - tasks: [import, build, export] - environment: [DISTRO=mingw, VERSION=w64, ARCH=i686, PKGBUILD_DIR=mingw-cross]
+ environment: [TARGET=mingw-w64-i686, PKGBUILD_DIR=mingw-cross] - tasks: [import, build, export]
- environment: [DISTRO=mingw, VERSION=w64, ARCH=x86_64, PKGBUILD_DIR=mingw-cross]
+ environment: [TARGET=mingw-w64-x86_64, PKGBUILD_DIR=mingw-cross] - tasks: [import, build, export]
opensuse-tumbleweed-amd64:
- environment: [DISTRO=opensuse, VERSION=tumbleweed]
+ environment: TARGET=opensuse-tumbleweed-amd64 - tasks: [import, build, export]
@@ -196,73 +152,47 @@
- - tasks: [import, build-target]
- - tasks: [export-target]
+ - tasks: [import, build] - environment: [TARGET=scanbuild]
+ environment: TARGET=scanbuild - - tasks: [import, build-target]
- - tasks: [export-target]
+ - tasks: [import, build] - environment: [TARGET=simple]
+ environment: TARGET=simple - - tasks: [import, build-target]
+ - tasks: [import, build]
- environment: [DISTRO=ubuntu, VERSION=focal]
- - tasks: [import, build, export]
- environment: [DISTRO=ubuntu, VERSION=groovy]
+ environment: TARGET=ubuntu-hirsute-amd64 - tasks: [import, build, export]
- environment: [TARGET=valgrind]
- - tasks: [import, build-target]
- - tasks: [export-target]
+ environment: TARGET=valgrind
- tasks: [import-artifacts, publish-deb, publish-debsrc]
- tasks: [import-artifacts, publish-rpm]
- tasks: [import-artifacts, publish-rpm]
- tasks: [import-artifacts, publish-deb, publish-debsrc]
+ - tasks: [import, build] + - debian-bookworm-amd64
- opensuse-tumbleweed-amd64
--- a/packaging/gplugin.spec.in Mon Aug 30 02:24:49 2021 -0500
+++ b/packaging/gplugin.spec.in Sun Sep 05 10:36:13 2021 -0500
@@ -15,7 +15,6 @@
BuildRequires: gobject-introspection-devel
BuildRequires: gtk3-devel
@@ -184,7 +183,7 @@
%{_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
@@ -207,7 +206,7 @@
%{_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
+* 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.