talkatu/talkatu

Bring everything up to latest distros.

2021-10-18, Gary Kramlich
e5283d38566e
Parents 5bb988234c35
Children 53d3a46592f2
Bring everything up to latest distros.

The debian build currently do not build packages as gi-docgen is not in debian
and you can't download a subproject while building a debian package.

Testing Done:
Built all the images locally and ran all the plans without issue.

Reviewed at https://reviews.imfreedom.org/r/1067/
4 files changed, 24 insertions(+), 29 deletions(-)
  • +3 -2
    .hgignore
  • +18 -23
    convey.yml
  • +1 -1
    packaging/debian/libtalkatu-doc.install
  • +2 -3
    packaging/talkatu.spec.in
    • --- a/.hgignore Mon Oct 18 02:40:39 2021 -0500
    +++ b/.hgignore Mon Oct 18 21:09:08 2021 -0500
    @@ -7,6 +7,7 @@
    ^artifacts\/
    ^build.*\/
    ^debian\/?
    +^fedora\/?
    ^packaging\/debian\/tmp\/
    ^packaging\/debian\/(.+\.)?(substvars|debhelper\.log)$
    ^packaging\/debian\/build.*\/
    @@ -18,6 +19,6 @@
    ^packaging\/debian\/files$
    ^po\/.+\.pot$
    ^obj-.+\/
    -^old\/
    +^scanbuild\/
    ^subprojects\/.+\/
    -
    +^valgrind\/
    --- a/convey.yml Mon Oct 18 02:40:39 2021 -0500
    +++ b/convey.yml Mon Oct 18 21:09:08 2021 -0500
    @@ -1,7 +1,7 @@
    environment:
    - BUILD_NUMBER
    - REGISTRY_HOST=docker.io
    - - REPOSITORY=docker.io/talkatu/builders
    + - REPOSITORY=talkatu/builders
    - DOCS_BUILD_IMAGE=docker.io/talkatu/builders:debian-bullseye-amd64
    tasks:
    @@ -12,12 +12,11 @@
    clean:
    type: convey/clean
    files:
    - - debian-bullseye-amd64
    - - debian-buster-amd64
    - - debian-buster-i386
    - - fedora-31-amd64
    - - fedora-32-amd64
    - - fedora-33-amd64
    + - debian-bookworm-amd64
    + - debian-bookworm-arm64
    + - debian-bookworm-armhf
    + - debian-bookworm-i386
    + - fedora-34-amd64
    - fedora-rawhide-amd64
    - scanbuild
    - valgrind
    @@ -47,16 +46,20 @@
    files: build-docs/talkatu/reference/talkatu:talkatu-docs
    plans:
    - debian-bullseye-amd64:
    - environment: TARGET=debian-bullseye-amd64
    + debian-bookworm-i386:
    + environment: TARGET=debian-bookworm-i386
    stages:
    - tasks: [import, build, export]
    - debian-buster-amd64:
    - environment: TARGET=debian-buster-amd64
    + debian-bookworm-amd64:
    + environment: TARGET=debian-bookworm-amd64
    stages:
    - tasks: [import, build, export]
    - debian-buster-i386:
    - environment: TARGET=debian-buster-i386
    + debian-bookworm-arm64:
    + environment: TARGET=debian-bookworm-arm64
    + stages:
    + - tasks: [import, build, export]
    + debian-bookworm-armhf:
    + environment: TARGET=debian-bookworm-armhf
    stages:
    - tasks: [import, build, export]
    @@ -64,16 +67,8 @@
    stages:
    - tasks: [docs-clean, import, docs-build, docs-export]
    - fedora-31-amd64:
    - environment: TARGET=fedora-31-amd64
    - stages:
    - - tasks: [import, build, export]
    - fedora-32-amd64:
    - environment: TARGET=fedora-32-amd64
    - stages:
    - - tasks: [import, build, export]
    - fedora-33-amd64:
    - environment: TARGET=fedora-33-amd64
    + fedora-34-amd64:
    + environment: TARGET=fedora-34-amd64
    stages:
    - tasks: [import, build, export]
    fedora-rawhide-amd64:
    --- a/packaging/debian/libtalkatu-doc.install Mon Oct 18 02:40:39 2021 -0500
    +++ b/packaging/debian/libtalkatu-doc.install Mon Oct 18 21:09:08 2021 -0500
    @@ -1,1 +1,1 @@
    -usr/share/gtk-doc
    +usr/share/doc/talkatu/
    --- a/packaging/talkatu.spec.in Mon Oct 18 02:40:39 2021 -0500
    +++ b/packaging/talkatu.spec.in Mon Oct 18 21:09:08 2021 -0500
    @@ -18,9 +18,9 @@
    BuildRequires: help2man
    BuildRequires: glade-devel
    BuildRequires: cmark-devel
    +BuildRequires: gi-docgen
    BuildRequires: gumbo-parser-devel
    BuildRequires: gspell-devel
    -BuildRequires: gtk-doc
    BuildRequires: vala
    %if 0%{?suse_version} > 0
    @@ -67,7 +67,6 @@
    %find_lang %{name}
    # Unneeded files
    -rm -rf %{buildroot}%{_datadir}/doc/talkatu/
    %if %{notownedhack} == 1
    rm -rf %{buildroot}%{_datadir}/talkatu/
    %endif
    @@ -100,8 +99,8 @@
    %{_libdir}/libtalkatu.so.0
    %{_libdir}/pkgconfig/talkatu.pc
    %{_libdir}/girepository-1.0/Talkatu-0.0.typelib
    +%{_datadir}/doc/talkatu/
    %{_datadir}/gir-1.0/Talkatu-0.0.gir
    -%{_datadir}/gtk-doc/html/talkatu/
    %{_datadir}/glade/catalogs/talkatu.xml
    %files vala