up to 1.32.0

diff --git a/libpeas-gtkdocdir.patch b/libpeas-gtkdocdir.patch
deleted file mode 100644 (file)
index 340c5b0..0000000
--- a/libpeas-gtkdocdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 = [
-   'gconstructor.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.spec b/libpeas.spec
index cdec0bf9ce8317021777cf9375f5f2dd23941469..bd39a40aa586bcaf8a15198435cb8ddbfd236235 100644 (file)
--- a/libpeas.spec
+++ b/libpeas.spec
@@ -16,20 +16,19 @@
 Summary:       GObject Plugin System
 Summary(pl.UTF-8):     System wtyczek GObject
 Name:          libpeas
-Version:       1.30.0
-Release:       3
+Version:       1.32.0
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       https://download.gnome.org/sources/libpeas/1.30/%{name}-%{version}.tar.xz
-# Source0-md5: 60b9d9fe2ee9dd518fb12d5d404e296a
-Patch0:                %{name}-gtkdocdir.patch
+Source0:       https://download.gnome.org/sources/libpeas/1.32/%{name}-%{version}.tar.xz
+# Source0-md5: ea067e520d1b19606dbe47d20c625b8f
 URL:           https://wiki.gnome.org/Libpeas
 BuildRequires: gettext-tools >= 0.19.7
+%{?with_apidocs:BuildRequires: gi-docgen >= 2021.7}
 %{?with_glade:BuildRequires:   glade-devel >= 2.0}
 BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gobject-introspection-devel >= 1.40.0
 BuildRequires: gtk+3-devel >= 3.0.0
-BuildRequires: gtk-doc >= 1.11
 %if %{with lua}
 BuildRequires: lua-lgi >= 0.9.0
 %{!?with_luajit:BuildRequires: lua51-devel >= 5.1.0}
@@ -240,7 +239,6 @@ Aplikacja demonstracyjna libpeas.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if %{with lua}
 # meson buildsystem expects .pc file for lua-lgi detection
@@ -273,6 +271,11 @@ rm -rf $RPM_BUILD_ROOT
 %py3_comp $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/pythonhello
 %py3_ocomp $RPM_BUILD_ROOT%{_libdir}/peas-demo/plugins/pythonhello
 
+%if %{with apidocs}
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/doc/libpeas-* $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
+
 %find_lang libpeas-1.0
 
 %clean
@@ -381,5 +384,6 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libpeas
+%{_gtkdocdir}/libpeas-1.0
+%{_gtkdocdir}/libpeas-gtk-1.0
 %endif