- updated to 1.24.0; now uses meson

- added tests-with-static patch (avoid tests build failure when static libraries are enabled)
- added gtkdocdir patch

diff --git a/libpeas-gtkdocdir.patch b/libpeas-gtkdocdir.patch
new file mode 100644 (file)
index 0000000..4177e17
--- /dev/null
+++ b/libpeas-gtkdocdir.patch
@@ -0,0 +1,35 @@
+--- libpeas-1.24.0/meson.build.orig    2019-09-10 02:41:29.000000000 +0200
++++ libpeas-1.24.0/meson.build 2019-10-01 18:34:15.763714876 +0200
+@@ -62,7 +62,6 @@
+ pkgdatadir = join_paths(datadir, package_string)
+ 
+ girdir = join_paths(datadir, 'gir-1.0')
+-gtkdocdir = join_paths(datadir, 'gtk-doc')
+ iconsdir = join_paths(datadir, 'icons')
+ pkgconfigdir = join_paths(libdir, 'pkgconfig')
+ typelibdir = join_paths(libdir, 'girepository-1.0')
+--- libpeas-1.24.0/docs/reference/meson.build.orig     2019-10-01 19:04:10.210660189 +0200
++++ libpeas-1.24.0/docs/reference/meson.build  2019-10-01 19:04:13.473975844 +0200
+@@ -1,8 +1,8 @@
+ glib_prefix = glib_dep.get_pkgconfig_variable('prefix')
+-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
++glib_docpath = join_paths(glib_prefix, 'share', 'doc', 'gtk-doc', 'html')
+ 
+ gtk_prefix = gtk_dep.get_pkgconfig_variable('prefix')
+-gtk_docpath = join_paths(gtk_prefix, 'share', 'gtk-doc', 'html')
++gtk_docpath = join_paths(gtk_prefix, 'share', 'doc', 'gtk-doc', 'html')
+ 
+ libpeas_reference_ignored_h = [
+   'peas-debug.h',
+@@ -90,10 +90,5 @@
+   scan_args: libpeas_reference_scan_args,
+   fixxref_args: libpeas_reference_fixxref_args,
+   mkdb_args: libpeas_reference_mkdb_args,
+-  install: true,
+-  install_dir: join_paths(
+-    gtkdocdir,
+-    'html',
+-    package_name,
+-  )
++  install: true
+ )

diff --git a/libpeas-tests-with-static.patch b/libpeas-tests-with-static.patch
new file mode 100644 (file)
index 0000000..811524a
--- /dev/null
+++ b/libpeas-tests-with-static.patch
@@ -0,0 +1,28 @@
+--- libpeas-1.24.0/libpeas-gtk/meson.build.orig        2019-09-10 02:41:29.000000000 +0200
++++ libpeas-1.24.0/libpeas-gtk/meson.build     2019-09-30 20:10:09.963943989 +0200
+@@ -42,16 +42,6 @@
+   )
+ )
+ 
+-# Static library used for testing symbol access
+-libpeas_gtk_test = static_library(
+-  package_gtk_string.strip('lib'),
+-  libpeas_gtk_c,
+-  include_directories: rootdir,
+-  dependencies: libpeas_gtk_deps,
+-  c_args: libpeas_gtk_c_args,
+-  link_args: libpeas_gtk_link_args,
+-)
+-
+ libpeas_gtk_sha = library(
+   package_gtk_string.strip('lib'),
+   libpeas_gtk_c,
+@@ -105,7 +95,7 @@
+ )
+ 
+ libpeas_gtk_test_dep = declare_dependency(
+-  link_with: libpeas_gtk_test,
++  link_with: libpeas_gtk_sha.get_static_lib(),
+   dependencies: libpeas_gtk_deps,
+   include_directories: rootdir,
+   sources: libpeas_gtk_dep_sources,

diff --git a/libpeas.spec b/libpeas.spec
index 029ec72a67f0b9a18d0714304208da4f0e2a0d2d..413edd2a1b469459253a46c801c509947e9a0ca0 100644 (file)
--- a/libpeas.spec
+++ b/libpeas.spec
@@ -1,9 +1,12 @@
 #
 # Conditional build:
-%bcond_without apidocs         # do not build and package API docs
+%bcond_without apidocs         # API documentation
 %bcond_without luajit          # LuaJIT implementation of lua 5.1
-%bcond_without static_libs     # don't build static libraries
-%bcond_without glade           # don't package glade catalog file
+%bcond_without static_libs     # static libraries
+%bcond_without glade           # glade catalog file packaging
+%bcond_without lua             # Lua (5.1) loader
+%bcond_without python2         # Python 2.x loader
+%bcond_without python3         # Python 3.x loader
 
 # luajit is not supported on x32
 %ifarch x32
@@ -13,33 +16,41 @@
 Summary:       GObject Plugin System
 Summary(pl.UTF-8):     System wtyczek GObject
 Name:          libpeas
-Version:       1.22.0
-Release:       2
-License:       LGPL v2
+Version:       1.24.0
+Release:       1
+License:       LGPL v2.1+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.22/%{name}-%{version}.tar.xz
-# Source0-md5: a20dc55c3f88ad06da9491cfd7de7558
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.24/%{name}-%{version}.tar.xz
+# Source0-md5: 7a136eea60930012deff2f7bfa3673be
+Patch0:                %{name}-tests-with-static.patch
+Patch1:                %{name}-gtkdocdir.patch
 URL:           https://wiki.gnome.org/Libpeas
-BuildRequires: autoconf >= 2.63.2
-BuildRequires: automake >= 1:1.11
 BuildRequires: gettext-tools >= 0.17
 %{?with_glade:BuildRequires:   glade-devel >= 2.0}
 BuildRequires: glib2-devel >= 1:2.38.0
-BuildRequires: gnome-common
 BuildRequires: gobject-introspection-devel >= 1.40.0
 BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: intltool >= 0.40.0
-BuildRequires: libtool >= 2:2.2.6
-BuildRequires: lua-lgi
+%if %{with lua}
+BuildRequires: lua-lgi >= 0.9.0
 %{!?with_luajit:BuildRequires: lua51-devel >= 5.1.0}
 %{?with_luajit:BuildRequires:  luajit-devel >= 2.0}
-BuildRequires: python >= 1:2.5.2
+%endif
+BuildRequires: meson >= 0.49.0
+BuildRequires: ninja >= 1.5
+%if %{with python2}
+BuildRequires: python-devel >= 1:2.5.2
 BuildRequires: python-pygobject3-devel >= 3.2.0
+%endif
+%if %{with python3}
 BuildRequires: python3-devel >= 1:3.2.0
+BuildRequires: python3-pygobject3-devel >= 3.2.0
+%endif
 BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+%{!?with_luajit:BuildConflicts:        luajit-devel}
 Requires:      glib2 >= 1:2.38.0
 Requires:      gobject-introspection >= 1.40.0
 Obsoletes:     libpeas-loader-gjs < 1.10.0
@@ -216,8 +227,12 @@ Summary(pl.UTF-8): Aplikacja demonstracyjna libpeas
 Group:         Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-gtk = %{version}-%{release}
+%if %{with lua}
 Requires:      %{name}-loader-lua = %{version}-%{release}
-Requires:      %{name}-loader-python = %{version}-%{release}
+%endif
+%if %{with python3}
+Requires:      %{name}-loader-python3 = %{version}-%{release}
+%endif
 
 %description demo
 Demo application for libpeas.
@@ -227,38 +242,43 @@ Aplikacja demonstracyjna libpeas.
 
 %prep
 %setup -q
+%if %{with static_libs}
+%patch0 -p1
+%endif
+%patch1 -p1
+
+%if %{with lua}
+# meson buildsystem expects .pc file for lua-lgi detection
+install -d fake-pkgconfig
+cat >fake-pkgconfig/lua5.1-lgi.pc <<'EOF'
+Name: lua-lgi
+Description: Lua LGI
+Version: %(rpm -q --qf '%%{V}\n' lua-lgi)
+EOF
+%endif
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       %{!?with_luajit:--disable-luajit} \
-       --disable-silent-rules \
-       %{__enable_disable apidocs gtk-doc} \
-       %{__enable_disable glade glade-catalog} \
-       %{__enable_disable static_libs static} \
-       --with-html-dir=%{_gtkdocdir}
-%{__make}
+export PKG_CONFIG_PATH=$(pwd)/fake-pkgconfig
+%meson build \
+       %{!?with_static_libs:--default-library=shared} \
+       %{!?with_glade:-Dglade_catalog=false} \
+       %{?with_apidocs:-Dgtk_doc=true} \
+       %{!?with_lua:-Dlua51=false} \
+       %{?with_python2:-Dpython2=true} \
+       %{!?with_python3:-Dpython3=false} \
+       -Dvapi=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la \
-       $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/*/*.la \
-       $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/*.la
+%py3_comp $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/pythonhello
+%py3_ocomp $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/pythonhello
 
-%if %{with static_libs}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/*/*.a \
-       $RPM_BUILD_ROOT%{_libdir}/libpeas-1.0/loaders/*.a
-%endif
-
-%find_lang libpeas
+%find_lang libpeas-1.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -274,26 +294,32 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 %update_icon_cache hicolor
 
-%files -f libpeas.lang
+%files -f libpeas-1.0.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_libdir}/libpeas-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpeas-1.0.so.0
 %dir %{_libdir}/libpeas-1.0
 %dir %{_libdir}/libpeas-1.0/loaders
 %{_libdir}/girepository-1.0/Peas-1.0.typelib
 
+%if %{with lua}
 %files loader-lua
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/liblua51loader.so
+%endif
 
+%if %{with python2}
 %files loader-python
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/libpythonloader.so
+%attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/libpython2loader.so
+%endif
 
+%if %{with python3}
 %files loader-python3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/libpython3loader.so
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -313,7 +339,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libpeas-gtk-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpeas-gtk-1.0.so.0
 %{_libdir}/girepository-1.0/PeasGtk-1.0.typelib
-%{_iconsdir}/hicolor/*/actions/libpeas-plugin.png
+%{_iconsdir}/hicolor/*x*/actions/libpeas-plugin.png
 %{_iconsdir}/hicolor/scalable/actions/libpeas-plugin.svg
 
 %files gtk-devel
@@ -342,12 +368,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/peas-demo/plugins/helloworld
 %attr(755,root,root) %{_libdir}/peas-demo/plugins/helloworld/libhelloworld.so
 %{_libdir}/peas-demo/plugins/helloworld/helloworld.plugin
+%if %{with lua}
 %dir %{_libdir}/peas-demo/plugins/luahello
+%{_libdir}/peas-demo/plugins/luahello/luahello.lua
 %{_libdir}/peas-demo/plugins/luahello/luahello.plugin
+%endif
+%if %{with python3}
 %dir %{_libdir}/peas-demo/plugins/pythonhello
 %{_libdir}/peas-demo/plugins/pythonhello/pythonhello.plugin
-%{_libdir}/peas-demo/plugins/pythonhello/pythonhello.py*
+%{_libdir}/peas-demo/plugins/pythonhello/pythonhello.py
 %{_libdir}/peas-demo/plugins/pythonhello/__pycache__
+%endif
 %dir %{_libdir}/peas-demo/plugins/secondtime
 %attr(755,root,root) %{_libdir}/peas-demo/plugins/secondtime/libsecondtime.so
 %{_libdir}/peas-demo/plugins/secondtime/secondtime.plugin