From 0cc560d9a9e761d7d1b067d837abc06664541ccf Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Feb 12 2020 22:58:03 +0000 Subject: 2.9.0 upstream release Upstream tag: libmodulemd-2.9.0 Upstream commit: af8f03df Signed-off-by: Stephen Gallagher --- diff --git a/.gitignore b/.gitignore index 7a6cda5..1a174ad 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /modulemd-2.8.1.tar.xz /modulemd-2.8.2.tar.xz /modulemd-2.8.3.tar.xz +/modulemd-2.9.0.tar.xz diff --git a/.make_packit_specfile.sh b/.make_packit_specfile.sh new file mode 100755 index 0000000..bef12c9 --- /dev/null +++ b/.make_packit_specfile.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +set -e + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +pushd $SCRIPT_DIR + +date=$(date +%Y%m%d) +version_desc=$(git describe --tags --match "*.*") +version=$(echo $version_desc | cut -d '-' -f2) +patch_count=$(echo $version_desc | cut -d '-' -f3) +hash=$(echo $version_desc | cut -d '-' -f4) + +if [ x$patch_count != x ]; then + release=0.${date}.${patch_count}git${hash}%{?dist} +else + release=0.${date}%{?dist} +fi + +./spec_tmpl.sh version=$version release=$release template=libmodulemd.spec.in > libmodulemd.spec + +popd diff --git a/.packit.yml b/.packit.yml new file mode 100644 index 0000000..7514322 --- /dev/null +++ b/.packit.yml @@ -0,0 +1,25 @@ +specfile_path: libmodulemd.spec +upstream_package_name: libmodulemd +downstream_package_name: libmodulemd +upstream_tag_template: libmodulemd-{version} +current_version_command: + - ./.packit_version.sh + +synced_files: + - .packit.yml + - .make_packit_specfile.sh + - libmodulemd.spec + +actions: + post-upstream-clone: ./.make_packit_specfile.sh + +jobs: +- job: copr_build + trigger: pull_request + metadata: + targets: fedora-all + +- job: propose_downstream + trigger: release + metadata: + dist-git-branch: fedora-all diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..19936d7 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.8.1. diff --git a/libmodulemd.spec b/libmodulemd.spec index fb4b8a6..777d5db 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -1,15 +1,15 @@ # Python 2 is dead on F31+ %if ( 0%{?fedora} && 0%{?fedora} <= 30 ) || ( 0%{?rhel} && 0%{?rhel} <= 7) - %global meson_override_flags -Dwith_py3_overrides=true -Dwith_py2_overrides=true + %global meson_python_flags -Dwith_py2=true %global build_python2 1 %else - %global meson_override_flags -Dwith_py3_overrides=true -Dwith_py2_overrides=false + %global meson_python_flags -Dwith_py2=false %global build_python2 0 %endif Name: libmodulemd -Version: 2.8.3 -Release: 2%{?dist} +Version: 2.9.0 +Release: 0.20200212%{?dist} Summary: Module metadata manipulation library License: MIT @@ -36,6 +36,7 @@ BuildRequires: python3-gobject-base %ifarch %{valgrind_arches} BuildRequires: valgrind %endif +BuildRequires: help2man # Patches @@ -59,15 +60,15 @@ Python 2 bindings for %{name} %endif -%package -n python3-%{name} +%package -n python%{python3_pkgversion}-%{name} Summary: Python 3 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3-gobject-base +Requires: python%{python3_pkgversion}-gobject-base Requires: %{py3_dist six} -Obsoletes: python3-modulemd < 1.3.4 +Obsoletes: python%{python3_pkgversion}-modulemd < 1.3.4 -%description -n python3-%{name} -Python 3 bindings for %{name} +%description -n python%{python3_pkgversion}-%{name} +Python %{python3_pkgversion} bindings for %{name} %package devel @@ -84,7 +85,10 @@ Development files for libmodulemd. %build -%meson -Ddeveloper_build=false %{meson_override_flags} +%meson -Ddeveloper_build=false \ + -Dskip_formatters=true \ + %{meson_python_flags} + %meson_build @@ -104,18 +108,34 @@ export MMD_SKIP_VALGRIND=1 # Don't run tests on ARM for now. There are problems with # performance on the builders and often these time out. %ifnarch %{arm} aarch64 -%meson_test +# The tests sometimes time out in CI, so give them a little extra time +%{__meson} test -C %{_vpath_builddir} %{?_smp_mesonflags} --print-errorlogs -t 5 %endif %install %meson_install +%if ( 0%{?rhel} && 0%{?rhel} <= 7) +# Don't conflict with modulemd-validator from 1.x included in the official +# RHEL 7 repos +mv %{buildroot}%{_bindir}/modulemd-validator \ + %{buildroot}%{_bindir}/modulemd-validator2 +%endif + + +%ldconfig_scriptlets + %files %license COPYING %doc README.md +%if ( 0%{?rhel} && 0%{?rhel} <= 7) +%{_bindir}/modulemd-validator2 +%else %{_bindir}/modulemd-validator +%endif +%{_mandir}/man1/modulemd-validator.1* %{_libdir}/%{name}.so.2* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Modulemd-2.0.typelib @@ -138,11 +158,14 @@ export MMD_SKIP_VALGRIND=1 %endif -%files -n python3-%{name} +%files -n python%{python3_pkgversion}-%{name} %{python3_sitearch}/gi/overrides/ %changelog +* Wed Feb 12 2020 Stephen Gallagher - 2.9.0-0.20200212 +- new upstream release: 2.9.0 + * Wed Jan 29 2020 Fedora Release Engineering - 2.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index abc5414..01d47e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modulemd-2.8.3.tar.xz) = 79bf7c1008cebe7cfae0ab3dc2ae74b43c7c78747c63154416700dd5b974dcb4a2c441361b9d8e497bc7f132e2bd735cfa2c6acfd3d8422e207e3517329f3c65 +SHA512 (modulemd-2.9.0.tar.xz) = ef44829b078f1a7ce807edbd043b9964005765c36ff0d7f896d85c7850a02c1414844a60d96ca6fa45efa064407cf62d417fa9100455e656327322f06b814759