- added gir patch, adjusted for --default-library=both in rpm macros (-static is...

diff --git a/libgepub-gir.patch b/libgepub-gir.patch
new file mode 100644 (file)
index 0000000..aec408d
--- /dev/null
+++ b/libgepub-gir.patch
@@ -0,0 +1,11 @@
+--- libgepub-0.6.0/libgepub/meson.build.orig   2018-03-15 08:39:19.000000000 +0100
++++ libgepub-0.6.0/libgepub/meson.build        2019-10-24 16:00:00.474890120 +0200
+@@ -65,7 +65,7 @@
+   install_dir: join_paths(get_option('libdir'), 'pkgconfig')
+ )
+ 
+-if get_option('introspection') and get_option('default_library') == 'shared'
++if get_option('introspection') and get_option('default_library') != 'static'
+   gir_incs = [
+     'GObject-2.0',
+     'libxml2-2.0',

diff --git a/libgepub.spec b/libgepub.spec
index 245859de794ef4d6aae6e15433d783ed7fa874de..ff12cce537d8b47d50eb3226d4a919c93f1c2910 100644 (file)
--- a/libgepub.spec
+++ b/libgepub.spec
@@ -6,20 +6,23 @@ Summary:      Library for epub documents
 Summary(pl.UTF-8):     Biblioteka do obsługi dokumentów epub
 Name:          libgepub
 Version:       0.6.0
-Release:       2
-License:       LGPL v2+
+Release:       3
+License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgepub/0.6/%{name}-%{version}.tar.xz
 # Source0-md5: 77e3f2e3f57436d426eaf996675e44aa
+Patch0:                %{name}-gir.patch
+URL:           https://gitlab.gnome.org/GNOME/libgepub
 BuildRequires: glib2-devel >= 2.0
-BuildRequires: gnome-common
 BuildRequires: gobject-introspection-devel >= 1.30.0
 BuildRequires: gtk-webkit4-devel
 BuildRequires: libarchive-devel
 BuildRequires: libsoup-devel >= 2.4
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: meson >= 0.41.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,8 +42,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2-devel >= 2.0
 Requires:      libarchive-devel
-Requires:      libxml2-devel
-Obsoletes:     libgepub-static < 0.6.0
+Requires:      libxml2-devel >= 2.0
 
 %description devel
 Header files for libgepub library.
@@ -48,17 +50,31 @@ Header files for libgepub library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libgepub.
 
+%package static
+Summary:       Static libgepub library
+Summary(pl.UTF-8):     Statyczna biblioteka libgepub
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static libgepub library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libgepub.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %meson build
-%meson_build -C build
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
+%doc AUTHORS MAINTAINERS NEWS README TODO
 %attr(755,root,root) %{_libdir}/libgepub-0.6.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgepub-0.6.so.0
 %{_libdir}/girepository-1.0/Gepub-0.6.typelib
@@ -79,3 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libgepub-0.6
 %{_pkgconfigdir}/libgepub-0.6.pc
 %{_datadir}/gir-1.0/Gepub-0.6.gir
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgepub-0.6.a