qulogic/gplugin

Lots of tweaks for version/rpm/and other deps for the build
develop
2018-12-03, Gary Kramlich
5f50efe6ee81
Parents 003bbd48e41f
Children bcec13266520
Lots of tweaks for version/rpm/and other deps for the build
4 files changed, 12 insertions(+), 10 deletions(-)
  • +3 -6
    meson.build
  • +1 -1
    packaging/debian/control
  • +1 -0
    packaging/debian/rules
  • +7 -3
    packaging/gplugin.spec.in
    • --- a/meson.build Mon Dec 03 22:35:39 2018 -0600
    +++ b/meson.build Mon Dec 03 23:31:50 2018 -0600
    @@ -1,8 +1,8 @@
    ###############################################################################
    # Project Info
    ###############################################################################
    -project('gplugin', 'c', version : '0.28.0dev',
    - meson_version : '>=0.41.0',
    +project('gplugin', 'c', version : '0.28.0-dev',
    + meson_version : '>=0.37.0',
    default_options : ['c_std=c99'])
    parts = meson.project_version().split('-')
    @@ -100,10 +100,7 @@
    ENABLE_DOC = get_option('doc')
    if ENABLE_DOC
    if meson.version().version_compare('<0.41.2')
    - if force_deps
    - error('Meson 0.41.2 or newer is required to build documentation.')
    - endif
    - ENABLE_DOC = false
    + error('Meson 0.41.2 or newer is required to build documentation.')
    endif
    endif
    --- a/packaging/debian/control Mon Dec 03 22:35:39 2018 -0600
    +++ b/packaging/debian/control Mon Dec 03 23:31:50 2018 -0600
    @@ -3,7 +3,7 @@
    Priority: optional
    Maintainer: Gary Kramlich <grim@reaperworld.com>
    Build-Depends: debhelper (>=9),
    - meson, libglib2.0-dev, libgtk-3-dev,
    + meson (>=0.37.0), libglib2.0-dev, libgtk-3-dev,
    xsltproc, gettext, help2man,
    gobject-introspection, libgirepository1.0-dev,
    liblua5.1-0-dev, lua-lgi,
    --- a/packaging/debian/rules Mon Dec 03 22:35:39 2018 -0600
    +++ b/packaging/debian/rules Mon Dec 03 23:31:50 2018 -0600
    @@ -12,6 +12,7 @@
    rm -rf $(BUILD_DIR)
    override_dh_auto_configure:
    + mkdir -p $(BUILD_DIR)
    meson --prefix /usr --warnlevel 3 $(BUILD_DIR)
    override_dh_auto_build:
    --- a/packaging/gplugin.spec.in Mon Dec 03 22:35:39 2018 -0600
    +++ b/packaging/gplugin.spec.in Mon Dec 03 23:31:50 2018 -0600
    @@ -1,12 +1,16 @@
    Name: gplugin
    -Version: @GPLUGIN_VERSION@
    -Release: %{?build_number}%{?!build_number:1}
    +Version: @GPLUGIN_MAJOR_VERSION@.@GPLUGIN_MINOR_VERSION@.@GPLUGIN_MICRO_VERSION@
    +%if "@GPLUGIN_EXTRA_VERSION@" == ""
    +Release: 1.%{?build_number}%{?!build_number:1}%{?dist}
    +%else
    +Release: 0.%{?build_number}%{?!build_number:1}%{?dist}
    +%endif
    License: LGPL-2.0+
    Summary: A GObject based library that implements a reusable plugin system
    Url: https://bitbucket.org/rw_grim/gplugin/overview
    Group: Development/Libraries
    -BuildRequires: meson >= 0.41.0
    +BuildRequires: meson >= 0.37.0
    BuildRequires: glib2-devel >= 2.40.0
    BuildRequires: gobject-introspection-devel
    BuildRequires: gettext