From 1f4f6e8ff56d923d17e692148ee09941f5402456 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 18 Feb 2021 20:05:59 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/yelp-tools.git#0e8e84b20a2b43d0a2828c3b795a798386da2832 --- .gitignore | 1 + sources | 2 +- yelp-tools.spec | 23 +++++++++++++++-------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 586b592..dba4b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /yelp-tools-3.32.2.tar.xz /yelp-tools-3.37.90.tar.xz /yelp-tools-3.38.0.tar.xz +/yelp-tools-40.beta.tar.xz diff --git a/sources b/sources index 2ba924a..2b20ef2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yelp-tools-3.38.0.tar.xz) = 2042e37f8efbe9974f5a507910393b837a0b9154beb918a5e8d145205fb519c8244bb405cf328ff5014287086be5b6d33ad631951bd0e950c2ad9efc60065d59 +SHA512 (yelp-tools-40.beta.tar.xz) = 9539ca88eb03c343596d398468331e814c948245a96f93cda7c7762d735ef0a8c95a067a89ab22dafc8d292b9c68e7123aa427fc4e8a8f61d13eafdfd2f0e5e9 diff --git a/yelp-tools.spec b/yelp-tools.spec index 0b95294..b4220bc 100644 --- a/yelp-tools.spec +++ b/yelp-tools.spec @@ -1,15 +1,18 @@ +%global tarball_version %%(echo %{version} | tr '~' '.') + Name: yelp-tools -Version: 3.38.0 -Release: 2%{?dist} +Version: 40~beta +Release: 1%{?dist} Summary: Create, manage, and publish documentation for Yelp License: GPLv2+ URL: https://wiki.gnome.org/Apps/Yelp/Tools -Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz BuildArch: noarch -BuildRequires: make +BuildRequires: meson BuildRequires: pkgconfig(yelp-xsl) +BuildRequires: python3-lxml BuildRequires: itstool BuildRequires: libxslt @@ -26,14 +29,14 @@ lifting is done by packages like yelp-xsl and itstool. This package just wraps things up in a developer-friendly way. %prep -%setup -q +%autosetup -p1 -n %{name}-%{tarball_version} %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %files %doc AUTHORS README @@ -45,6 +48,10 @@ make %{?_smp_mflags} %{_datadir}/aclocal/yelp.m4 %changelog +* Thu Feb 18 2021 Kalev Lember - 40~beta-1 +- Update to 40.beta +- Switch to meson build system + * Thu Jan 28 2021 Fedora Release Engineering - 3.38.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild