- updated to 1.8.2, now uses meson

diff --git a/ganv.spec b/ganv.spec
index 465b53ee4423188c540176a365278a916e6c2ef7..fd1c5698a8004dec368de886a88df011c21406f4 100644 (file)
--- a/ganv.spec
+++ b/ganv.spec
@@ -1,22 +1,26 @@
 Summary:       Interactive Gtk canvas widget for graph-based interfaces
 Summary(pl.UTF-8):     Interaktywny widget płótna Gtk dla interfejsów opartych na grafach
 Name:          ganv
-Version:       1.8.0
+Version:       1.8.2
 Release:       1
 License:       GPL v3+
 Group:         Libraries
-Source0:       http://download.drobilla.net/%{name}-%{version}.tar.bz2
-# Source0-md5: 37419b39a90622de9cf27e034fdb33c1
+Source0:       http://download.drobilla.net/%{name}-%{version}.tar.xz
+# Source0-md5: 0c0955e674e9cbd6a493a6c6b5717640
 URL:           http://drobilla.net/software/ganv/
 BuildRequires: gettext-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: graphviz-devel >= 2.30
-BuildRequires: gtk+2-devel >= 2.0
+BuildRequires: gtk+2-devel >= 2:2.10.0
 BuildRequires: gtkmm-devel >= 2.10.0
 BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: meson >= 0.56.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
-BuildRequires: python >= 2
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 BuildRequires: yelp-tools
+Requires:      gtk+2 >= 2:2.10.0
 Requires:      gtkmm >= 2.10.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,7 +39,7 @@ Summary:      Header files for Ganv library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Ganv
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gtk+2-devel >= 2.0
+Requires:      gtk+2-devel >= 2:2.10.0
 Requires:      gtkmm-devel >= 2.10.0
 
 %description devel
@@ -48,24 +52,15 @@ Pliki nagłówkowe biblioteki Ganv.
 %setup -q
 
 %build
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
-./waf configure \
-       --prefix=%{_prefix} \
-       --libdir=%{_libdir} \
-       --gir \
-       --strict
+%meson build \
+       --default-library=shared
 
-./waf -v
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-./waf install \
-       --destdir=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_datadir}/gir-1.0
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/*.gir $RPM_BUILD_ROOT%{_datadir}/gir-1.0
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,7 +71,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README.md
-%attr(755,root,root) %{_bindir}/ganv_bench
 %attr(755,root,root) %{_libdir}/libganv-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libganv-1.so.1
 %{_libdir}/girepository-1.0/Ganv-1.0.typelib