gplugin/gplugin

move from fedora 25/26 to 28/29 and update the spec file to reflect the current build
develop
2018-11-28, Gary Kramlich
7f50d0ac9092
Parents fae543ccc4d3
Children f880c9f24564
move from fedora 25/26 to 28/29 and update the spec file to reflect the current build
2 files changed, 29 insertions(+), 26 deletions(-)
  • +23 -23
    convey.yml
  • +6 -3
    packaging/gplugin.spec.in
    • --- a/convey.yml Wed Nov 28 01:03:12 2018 -0600
    +++ b/convey.yml Wed Nov 28 23:28:04 2018 -0600
    @@ -83,34 +83,34 @@
    #############################################################################
    # Fedora
    #############################################################################
    - build-fedora-25-amd64:
    + build-fedora-28-amd64:
    type: docker/run
    - image: gplugin/builders:fedora-25-amd64
    - export-fedora-25-amd64:
    + image: gplugin/builders:fedora-28-amd64
    + export-fedora-28-amd64:
    type: docker/export
    - files: fedora-25-amd64:artifacts/
    - package-cloud-fedora-25-amd64:
    + files: fedora-28-amd64
    + package-cloud-fedora-28-amd64:
    type: convey/extend
    task: package-cloud
    environment:
    - PACKAGECLOUD_TOKEN
    - REPOSITORY=pidgin/experimental
    - - DISTRIBUTION=fedora/25
    - - FILES=fedora-25-amd64/x86_64/*.rpm
    - build-fedora-26-amd64:
    + - DISTRIBUTION=fedora/28
    + - FILES=fedora-28-amd64/x86_64/*.rpm
    + build-fedora-29-amd64:
    type: docker/run
    - image: gplugin/builders:fedora-26-amd64
    - export-fedora-26-amd64:
    + image: gplugin/builders:fedora-29-amd64
    + export-fedora-29-amd64:
    type: docker/export
    - files: fedora-26-amd64:artifacts/
    - package-cloud-fedora-26-amd64:
    + files: fedora-29-amd64
    + package-cloud-fedora-29-amd64:
    type: convey/extend
    task: package-cloud
    environment:
    - PACKAGECLOUD_TOKEN
    - REPOSITORY=pidgin/experimental
    - - DISTRIBUTION=fedora/26
    - - FILES=fedora-26-amd64/x86_64/*.rpm
    + - DISTRIBUTION=fedora/29
    + - FILES=fedora-29-amd64/x86_64/*.rpm
    #############################################################################
    # OpenSUSE
    @@ -138,7 +138,7 @@
    image: gplugin/builders:scanbuild
    export-scanbuild:
    type: docker/export
    - files: scanbuild:artifacts/
    + files: scanbuild
    #############################################################################
    # Ubuntu
    @@ -220,18 +220,18 @@
    - package-cloud-debian-testing-amd64
    - package-cloud-debian-testing-source
    - fedora-25-amd64:
    + fedora-28-amd64:
    stages:
    - tasks:
    - import
    - - build-fedora-25-amd64
    - - export-fedora-25-amd64
    - fedora-26-amd64:
    + - build-fedora-28-amd64
    + - export-fedora-28-amd64
    + fedora-29-amd64:
    stages:
    - tasks:
    - import
    - - build-fedora-26-amd64
    - - export-fedora-26-amd64
    + - build-fedora-29-amd64
    + - export-fedora-29-amd64
    fedora-package-cloud:
    stages:
    - name: import packages
    @@ -297,8 +297,8 @@
    - debian-buster-amd64
    fedora:
    plans:
    - - fedora-25-amd64
    - - fedora-26-amd64
    + - fedora-28-amd64
    + - fedora-29-amd64
    ubuntu:
    plans:
    - ubuntu-xenial-amd64
    --- a/packaging/gplugin.spec.in Wed Nov 28 01:03:12 2018 -0600
    +++ b/packaging/gplugin.spec.in Wed Nov 28 23:28:04 2018 -0600
    @@ -11,6 +11,7 @@
    BuildRequires: gobject-introspection-devel
    BuildRequires: gettext
    BuildRequires: gtk3-devel
    +BuildRequires: gtk-doc
    BuildRequires: help2man
    BuildRequires: libxslt
    BuildRequires: lua-devel
    @@ -197,6 +198,7 @@
    %{_libdir}/pkgconfig/gplugin.pc
    %{_libdir}/pkgconfig/gplugin-gtk.pc
    %{_libdir}/girepository-1.0/GPlugin-0.0.typelib
    +%{_datadir}/gtk-doc/html/gplugin/
    %{_datadir}/gir-1.0/GPlugin-0.0.gir
    %files gtk3
    @@ -207,9 +209,6 @@
    %endif
    %{_bindir}/gplugin-gtk-viewer
    %{_libdir}/libgplugin-gtk.so.0.1.0
    -%if %{notownedhack} == 0
    -%{_datadir}/gplugin/gplugin-gtk/
    -%endif
    %{_mandir}/man1/gplugin-gtk-viewer.1*
    %files gtk3-devel
    @@ -220,6 +219,10 @@
    %endif
    %{_libdir}/libgplugin-gtk.so
    %{_libdir}/libgplugin-gtk.so.0
    +%{_libdir}/girepository-1.0/GPluginGtk-0.0.typelib
    +%{_datadir}/gir-1.0/GPluginGtk-0.0.gir
    +%{_datadir}/glade/catalogs/gplugin-gtk.xml
    +%{_datadir}/gtk-doc/html/gplugin-gtk/
    %files lua
    %defattr(-,root,root)