From 4661d4d3211114f6260787dc46f55506d0ece6f9 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 4 May 2022 19:38:46 +0200 Subject: [PATCH] - updated to 5.4.0, now uses meson --- amtk.spec | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/amtk.spec b/amtk.spec index d330aca..b217350 100644 --- a/amtk.spec +++ b/amtk.spec @@ -5,22 +5,23 @@ Summary: Amtk - Actions, Menus and Toolbars Kit for GTK+ applications Summary(pl.UTF-8): Amtk - zestaw akcji, menu i pasków narzędzi dla aplikacji GTK+ Name: amtk -Version: 5.2.0 +Version: 5.4.0 Release: 1 -License: LGPL v2.1+ +License: LGPL v3+ Group: Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/amtk/5.2/%{name}-%{version}.tar.xz -# Source0-md5: 8ea25cde8b7bdbf98d7d6c939dea1724 +Source0: https://download.gnome.org/sources/amtk/5.4/%{name}-%{version}.tar.xz +# Source0-md5: 1906862fe99a0ea104a8431780d3d0b6 URL: https://wiki.gnome.org/Projects/Amtk -BuildRequires: autoconf >= 2.64 -BuildRequires: automake >= 1:1.14 BuildRequires: gettext-tools >= 0.19.6 BuildRequires: glib2-devel >= 1:2.56 BuildRequires: gobject-introspection-devel >= 1.42.0 BuildRequires: gtk+3-devel >= 3.22 BuildRequires: gtk-doc >= 1.25 -BuildRequires: libtool >= 2:2.2.6 +BuildRequires: meson >= 0.53 +BuildRequires: ninja >= 1.5 BuildRequires: pkgconfig +BuildRequires: rpm-build >= 4.6 +BuildRequires: rpmbuild(macros) >= 1.736 Requires: glib2 >= 1:2.56 Requires: gtk+3 >= 3.22 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -78,26 +79,15 @@ Dokumentacja API biblioteki Amtk. %setup -q %build -# rebuild ac/am/lt for as-needed to work -%{__libtoolize} -%{__aclocal} -I m4 -%{__autoconf} -%{__autoheader} -%{__automake} -%configure \ - --disable-silent-rules \ - %{?with_static_libs:--enable-static} \ - --with-html-dir=%{_gtkdocdir} -%{__make} +%meson build \ + %{!?with_static_libs:--default-library=shared} + +%ninja_build -C build %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -# obsoleted by pkg-config -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libamtk-5.la +%ninja_install -C build %find_lang amtk-5 @@ -109,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT %files -f amtk-5.lang %defattr(644,root,root,755) -%doc AUTHORS NEWS README +%doc NEWS README.md %attr(755,root,root) %{_libdir}/libamtk-5.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libamtk-5.so.0 %{_libdir}/girepository-1.0/Amtk-5.typelib @@ -129,4 +119,4 @@ rm -rf $RPM_BUILD_ROOT %files apidocs %defattr(644,root,root,755) -%{_gtkdocdir}/amtk-5.0 +%{_gtkdocdir}/amtk-5 -- 2.44.0