From 2611d2134510295cb485cc82eef728ca9ae50bbe Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 15 Dec 2020 10:55:45 +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/atkmm.git#be3c1c5e0c753949f0354901072e6d6c4c25937a --- .gitignore | 1 + atkmm.spec | 37 ++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index c566ec8..0de567e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ atkmm-2.21.2.tar.bz2 /atkmm-2.24.1.tar.xz /atkmm-2.24.2.tar.xz /atkmm-2.24.3.tar.xz +/atkmm-2.28.1.tar.xz diff --git a/atkmm.spec b/atkmm.spec index a59024c..465e7d7 100644 --- a/atkmm.spec +++ b/atkmm.spec @@ -2,20 +2,25 @@ # first two digits of version %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') -%global glibmm24_version 2.46.1 +%global glibmm24_version 2.46.2 Name: atkmm -Version: 2.24.3 -Release: 6%{?dist} +Version: 2.28.1 +Release: 1%{?dist} Summary: C++ interface for the ATK library License: LGPLv2+ -URL: http://www.gtkmm.org/ -Source0: http://ftp.gnome.org/pub/GNOME/sources/atkmm/%{release_version}/atkmm-%{version}.tar.xz +URL: https://www.gtkmm.org/ +Source0: https://download.gnome.org/sources/atkmm/%{release_version}/atkmm-%{version}.tar.xz -BuildRequires: gcc-c++ BuildRequires: atk-devel +BuildRequires: doxygen +BuildRequires: gcc-c++ BuildRequires: glibmm24-devel >= %{glibmm24_version} +BuildRequires: libxslt +BuildRequires: m4 +BuildRequires: meson +BuildRequires: mm-common Requires: glibmm24%{?_isa} >= %{glibmm24_version} @@ -28,7 +33,7 @@ quickly create complex user interfaces. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -54,13 +59,12 @@ documentation browser or through a web browser. %build -%configure --disable-static -%make_build +%meson -Dbuild-documentation=true +%meson_build %install -%make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%meson_install %ldconfig_scriptlets @@ -69,11 +73,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files %license COPYING %doc AUTHORS NEWS README -%{_libdir}/*.so.* +%{_libdir}/libatkmm-%{apiver}.so.1* %files devel %{_includedir}/atkmm-%{apiver}/ -%{_libdir}/*.so +%{_libdir}/libatkmm-%{apiver}.so %{_libdir}/pkgconfig/*.pc %{_libdir}/atkmm-%{apiver}/ @@ -83,6 +87,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon Dec 14 2020 Kalev Lember - 2.28.1-1 +- Update to 2.28.1 +- Switch to meson build system +- Update source URLs +- Tighten -devel subpackage deps +- Tighten soname globs + * Mon Jul 27 2020 Fedora Release Engineering - 2.24.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 7265a0f..a53d83e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (atkmm-2.24.3.tar.xz) = dc08efcd965b4ac385f73847d065d7cbf5f8e05b8644f49a6d794805a7bd6a9a03ff159c308b9062fe66d8acfc8e8e237654622c6a7cd22fde5a518388290cb6 +SHA512 (atkmm-2.28.1.tar.xz) = 9f336b594930b62e9789011f4584f569d40b6153e5f3f04ac0f5b48704c50fb7b99d3f5d8639eec8dfd42b9c268df3cf21c2ae2372fdb781729fa29c57365916