- updated to 3.34.0

- updated bookdir patch
- removed outdated use-python3 patch

diff --git a/devhelp-bookdir.patch b/devhelp-bookdir.patch
index 6ba85c1a8872e03d748187b2e3c9b2b282beff9c..57fd6612da1189fc0aeb77e78d2a3fde7919d070 100644 (file)
--- a/devhelp-bookdir.patch
+++ b/devhelp-bookdir.patch
@@ -1,14 +1,13 @@
-diff -urN devhelp-2.32.0/src/dh-book-manager.c devhelp-2.32.0.new//src/dh-book-manager.c
---- devhelp-2.32.0/src/dh-book-manager.c       2010-09-13 12:10:02.000000000 +0200
-+++ devhelp-2.32.0.new//src/dh-book-manager.c  2010-09-30 22:25:57.471564288 +0200
-@@ -145,6 +145,10 @@
-         dir = g_build_filename (data_dir, "gtk-doc", "html", NULL);
-         book_manager_add_from_dir (book_manager, dir);
+--- devhelp-3.34.0/devhelp/dh-book-list-builder.c.orig 2019-11-13 16:42:36.696750189 +0100
++++ devhelp-3.34.0/devhelp/dh-book-list-builder.c      2019-11-13 16:42:40.750061563 +0100
+@@ -140,6 +140,10 @@
+         add_book_list_directory (builder, dir);
          g_free (dir);
-+        
+ 
 +        dir = g_build_filename (data_dir, "doc", "gtk-doc", "html", NULL);
-+        book_manager_add_from_dir (book_manager, dir);
++        add_book_list_directory (builder, dir);
 +        g_free (dir);
- 
++
          dir = g_build_filename (data_dir, "devhelp", "books", NULL);
-         book_manager_add_from_dir (book_manager, dir);
+         add_book_list_directory (builder, dir);
+         g_free (dir);

diff --git a/devhelp-use-python3.patch b/devhelp-use-python3.patch
deleted file mode 100644 (file)
index 06dd90b..0000000
--- a/devhelp-use-python3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- devhelp-3.8.0/configure.ac.python  2013-03-31 00:42:37.145207175 +0100
-+++ devhelp-3.8.0/configure.ac 2013-03-31 00:42:46.015159122 +0100
-@@ -105,7 +105,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
- 
- AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
- 
--AM_PATH_PYTHON([2.3],[],[no])
-+AM_PATH_PYTHON([3.3],[],[no])
- 
- LIBGD_INIT([
-   main-toolbar

diff --git a/devhelp.spec b/devhelp.spec
index 60c63967696a971e28af96784426878d889d1a2c..cdab6c0fe2c5902d2476ea912c523d2555cd2099 100644 (file)
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -6,38 +6,37 @@
 Summary:       API documentation browser for GNOME
 Summary(pl.UTF-8):     Przeglądarka dokumentacji API dla GNOME
 Name:          devhelp
-Version:       3.26.1
+Version:       3.34.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.26/%{name}-%{version}.tar.xz
-# Source0-md5: 825da3043a238733f96b7929a5400fa8
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/devhelp/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: 90b35598224076948dd6b2da25de647c
 Patch0:                %{name}-bookdir.patch
-Patch1:                %{name}-use-python3.patch
 URL:           https://wiki.gnome.org/Apps/Devhelp
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.14
+BuildRequires: amtk-devel >= 5.0
 BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.38.0
-BuildRequires: gnome-common >= 2.24.0
+BuildRequires: glib2-devel >= 1:2.56
 BuildRequires: gobject-introspection-devel >= 1.30.0
+BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: gtk+3-devel >= 3.22.0
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.25}
-BuildRequires: gtk-webkit4-devel >= 2.6.0
-BuildRequires: libtool >= 2:2.2
+BuildRequires: gtk-webkit4-devel >= 2.20
+BuildRequires: meson >= 0.47
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
-BuildRequires: python3 >= 1:3.3
+BuildRequires: python3-devel >= 1:3.3
 BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-BuildRequires: zlib-devel
-Requires(post,postun): glib2 >= 1:2.38.0
+Requires(post,postun): glib2 >= 1:2.56
 Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      amtk >= 5.0
+Requires:      gsettings-desktop-schemas
 Requires:      hicolor-icon-theme
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,9 +49,9 @@ Przeglądarka dokumentacji API dla GNOME.
 Summary:       Library to embed Devhelp in other applications
 Summary(pl.UTF-8):     Biblioteka do osadzania Devhelp w innych aplikacjach
 Group:         X11/Libraries
-Requires:      glib2 >= 1:2.38.0
-Requires:      gtk+3 >= 3.20.0
-Requires:      gtk-webkit4 >= 2.6.0
+Requires:      glib2 >= 1:2.56
+Requires:      gtk+3 >= 3.22.0
+Requires:      gtk-webkit4 >= 2.20
 
 %description libs
 Library of Devhelp for embedding into other applications.
@@ -65,9 +64,9 @@ Summary:      Headers for Devhelp library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Devhelp
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.38.0
+Requires:      glib2-devel >= 1:2.56
 Requires:      gtk+3-devel >= 3.22.0
-Requires:      gtk-webkit4-devel >= 2.6.0
+Requires:      gtk-webkit4-devel >= 2.20
 
 %description devel
 Headers for Devhelp library.
@@ -123,31 +122,28 @@ Wtyczka umożliwiająca przeglądanie dokumentacji API w edytorze Gedit.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
+%if %{with static_libs}
+%{__sed} -i '/libdevhelp = / s/shared_library/library/' devhelp/meson.build
+%endif
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       %{__enable_disable apidocs gtk-doc} \
-       %{__enable_disable static_libs static} \
-       %{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
-       --disable-silent-rules
-%{__make}
+%meson build \
+       %{?with_apidocs:-Dgtk_doc=true}
+
+%ninja_build -C build
+#      %{__enable_disable static_libs static} \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{books,references,specs}
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%py3_comp $RPM_BUILD_ROOT%{_libdir}/gedit/plugins
+%py3_ocomp $RPM_BUILD_ROOT%{_libdir}/gedit/plugins
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,22 +161,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README TODO
 %attr(755,root,root) %{_bindir}/devhelp
-%{_datadir}/%{name}
-%{_desktopdir}/org.gnome.Devhelp.desktop
-%{_iconsdir}/hicolor/*x*/apps/devhelp.png
-%{_iconsdir}/hicolor/symbolic/apps/devhelp-symbolic.svg
-%{_datadir}/GConf/gsettings/devhelp.convert
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/assistant
+# 3 following are data dirs
+%dir %{_datadir}/%{name}/books
+%dir %{_datadir}/%{name}/references
+%dir %{_datadir}/%{name}/specs
+%{_datadir}/dbus-1/services/org.gnome.Devhelp.service
 %{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.libdevhelp-3.gschema.xml
 %{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
-%{_datadir}/dbus-1/services/org.gnome.Devhelp.service
+%{_desktopdir}/org.gnome.Devhelp.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Devhelp.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Devhelp-symbolic.svg
 %{_mandir}/man1/devhelp.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdevhelp-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdevhelp-3.so.4
+%attr(755,root,root) %ghost %{_libdir}/libdevhelp-3.so.6
 %{_libdir}/girepository-1.0/Devhelp-3.0.typelib
 
 %files devel
@@ -188,7 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdevhelp-3.so
 %{_datadir}/gir-1.0/Devhelp-3.0.gir
 %{_pkgconfigdir}/libdevhelp-3.0.pc
-%{_includedir}/devhelp-3.0
+%{_includedir}/devhelp-3
 
 %files static
 %defattr(644,root,root,755)
@@ -202,6 +203,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n gedit-plugin-devhelp
 %defattr(644,root,root,755)
-%{_libdir}/gedit/plugins/__pycache__
 %{_libdir}/gedit/plugins/devhelp.plugin
 %{_libdir}/gedit/plugins/devhelp.py
+%{_libdir}/gedit/plugins/__pycache__/devhelp.cpython-*.py[co]