diff --git a/gtkmm30.spec b/gtkmm30.spec index b53de44..42e2f75 100644 --- a/gtkmm30.spec +++ b/gtkmm30.spec @@ -2,28 +2,33 @@ # first two digits of version %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') -%global atkmm_version 2.24.2 +%global glibmm24_version 2.54.0 +%global gtk3_version 3.24.0 %global cairomm_version 1.12.0 -%global gdk_pixbuf2_version 2.35.5 -%global glibmm24_version 2.49.1 -%global gtk3_version 3.22.0 %global pangomm_version 2.38.2 +%global gdk_pixbuf2_version 2.35.5 +%global atkmm_version 2.24.2 Name: gtkmm30 -Version: 3.24.2 -Release: 4%{?dist} +Version: 3.24.3 +Release: 1%{?dist} Summary: C++ interface for the GTK+ library License: LGPLv2+ -URL: http://www.gtkmm.org/ -Source0: http://download.gnome.org/sources/gtkmm/%{release_version}/gtkmm-%{version}.tar.xz +URL: https://www.gtkmm.org/ +Source0: https://download.gnome.org/sources/gtkmm/%{release_version}/gtkmm-%{version}.tar.xz -BuildRequires: gcc-c++ BuildRequires: atkmm-devel >= %{atkmm_version} BuildRequires: cairomm-devel >= %{cairomm_version} +BuildRequires: doxygen +BuildRequires: gcc-c++ BuildRequires: gdk-pixbuf2-devel >= %{gdk_pixbuf2_version} BuildRequires: glibmm24-devel >= %{glibmm24_version} BuildRequires: gtk3-devel >= %{gtk3_version} +BuildRequires: libxslt +BuildRequires: m4 +BuildRequires: meson +BuildRequires: mm-common BuildRequires: pangomm-devel >= %{pangomm_version} Requires: atkmm%{?_isa} >= %{atkmm_version} @@ -67,38 +72,25 @@ cp -a demos/ _docs/ %build -# Disable LTO to work around https://bugzilla.redhat.com/show_bug.cgi?id=1898054 -%define _lto_cflags %{nil} - -%configure --disable-static - -# fix lib64 rpaths -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - -# avoid unused direct dependencies -sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - -make %{?_smp_mflags} +%meson -Dbuild-documentation=true +%meson_build %install -%make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - - -%ldconfig_scriptlets +%meson_install %files %license COPYING %doc AUTHORS NEWS README -%{_libdir}/*.so.* +%{_libdir}/libgdkmm-%{apiver}.so.1* +%{_libdir}/libgtkmm-%{apiver}.so.1* %files devel %{_includedir}/gtkmm-%{apiver}/ %{_includedir}/gdkmm-%{apiver}/ -%{_libdir}/*.so +%{_libdir}/libgdkmm-%{apiver}.so +%{_libdir}/libgtkmm-%{apiver}.so %{_libdir}/gtkmm-%{apiver}/ %{_libdir}/gdkmm-%{apiver}/ %{_libdir}/pkgconfig/*.pc @@ -110,6 +102,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon Dec 14 2020 Kalev Lember - 3.24.3-1 +- Update to 3.24.3 +- Use https source URLs +- Re-enable LTO now that we have upstream fix in place (#1898054) +- Switch to meson build system +- Tighten soname globs + * Sat Nov 21 2020 Andrew Potter - 3.24.2-4 - Opt-out of LTO (#1898054) diff --git a/sources b/sources index 7aa4436..69c893b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtkmm-3.24.2.tar.xz) = c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689 +SHA512 (gtkmm-3.24.3.tar.xz) = e373807ec245057708655fa5dbf18d5391656a55b008fd6aa0fdc5a56e80d288813c3bbb0093f39aa7679df866a176f1e6b0e842d4d1b18b775a5928eed9fef5