- up to 0.26.4

diff --git a/libgit2-glib.spec b/libgit2-glib.spec
index 30b0f4e06d4c02c23d0651d697fcb0fc4bc21c79..f7eaadb9f9a651d1e0265a248eae912bdc405a30 100644 (file)
--- a/libgit2-glib.spec
+++ b/libgit2-glib.spec
@@ -2,22 +2,22 @@
 # Conditional build:
 %bcond_without apidocs         # API documentation
 %bcond_without python          # Python binding
-%bcond_without static_libs     # static library
 
 Summary:       GLib wrapper library around the libgit2 git access library
 Summary(pl.UTF-8):     Biblioteka obudowania GLib do biblioteki dostępu do gita libgit2
 Name:          libgit2-glib
-Version:       0.26.2
-Release:       2
+Version:       0.26.4
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgit2-glib/0.26/%{name}-%{version}.tar.xz
-# Source0-md5: 6fe1112253aa6818edb03dc40cface06
+# Source0-md5: 042bbee8f440adacd0532c1e2f389d52
 URL:           https://wiki.gnome.org/Libgit2-glib
 BuildRequires: glib2-devel >= 1:2.44.0
 BuildRequires: gobject-introspection-devel >= 0.10.1
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.11}
 BuildRequires: libgit2-devel >= 0.26.0
+BuildRequires: meson
 BuildRequires: pkgconfig
 BuildRequires: python3 >= 1:3.2.3
 BuildRequires: python3-pygobject3-devel >= 3.0.0
@@ -57,18 +57,6 @@ Header files for libgit2-glib library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libgit2-glib.
 
-%package static
-Summary:       Static libgit2-glib library
-Summary(pl.UTF-8):     Statyczna biblioteka libgit2-glib
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static libgit2-glib library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libgit2-glib.
-
 %package apidocs
 Summary:       libgit2-glib API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libgit2-glib
@@ -118,20 +106,20 @@ API języka Vala do biblioteki libgit2-glib.
 %setup -q
 
 %build
-%configure \
-       --disable-silent-rules \
-       %{?with_static_libs:--enable-static} \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+       -Dssh=true \
+       -Dpython=true \
+       -Dgtk_doc=true
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgit2-glib-1.0.la
+%py3_comp $RPM_BUILD_ROOT
+%py3_ocomp $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,12 +141,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/Ggit-1.0.gir
 %{_pkgconfigdir}/libgit2-glib-1.0.pc
 
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgit2-glib-1.0.a
-%endif
-
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
@@ -176,3 +158,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/ggit-1.0.deps
 %{_datadir}/vala/vapi/ggit-1.0.vapi
+%{_datadir}/vala/vapi/libgit2-glib-1.0.deps
+%{_datadir}/vala/vapi/libgit2-glib-1.0.vapi