.devhelp.metadata

@@ -0,0 +1 @@
+7c82a922823cc6c16fd19221cc0eb5b8e222af54 SOURCES/devhelp-40.1.tar.xz

.gitignore

@@ -1,68 +1 @@
-devhelp-2.90.5.tar.bz2
+SOURCES/devhelp-40.1.tar.xz
-/devhelp-2.91.4.tar.bz2
-/devhelp-2.91.5.tar.bz2
-/devhelp-2.91.90.tar.bz2
-/devhelp-2.91.91.tar.bz2
-/devhelp-2.91.91.1.tar.bz2
-/devhelp-2.91.91.2.tar.bz2
-/devhelp-2.91.92.tar.bz2
-/devhelp-3.0.0.tar.bz2
-/devhelp-3.2.0.tar.xz
-/devhelp-3.3.3.tar.xz
-/devhelp-3.3.91.tar.xz
-/devhelp-3.4.0.tar.xz
-/devhelp-3.4.1.tar.xz
-/devhelp-3.5.5.tar.xz
-/devhelp-3.5.92.tar.xz
-/devhelp-3.6.0.tar.xz
-/devhelp-3.6.1.tar.xz
-/devhelp-3.7.3.tar.xz
-/devhelp-3.7.5.tar.xz
-/devhelp-3.7.91.tar.xz
-/devhelp-3.8.0.tar.xz
-/devhelp-3.8.1.tar.xz
-/devhelp-3.8.2.tar.xz
-/devhelp-3.9.4.tar.xz
-/devhelp-3.9.5.tar.xz
-/devhelp-3.9.90.tar.xz
-/devhelp-3.9.91.tar.xz
-/devhelp-3.10.0.tar.xz
-/devhelp-3.10.2.tar.xz
-/devhelp-3.11.4.tar.xz
-/devhelp-3.11.91.tar.xz
-/devhelp-3.11.92.tar.xz
-/devhelp-3.12.0.tar.xz
-/devhelp-3.12.1.tar.xz
-/devhelp-3.13.4.tar.xz
-/devhelp-3.13.90.tar.xz
-/devhelp-3.13.92.tar.xz
-/devhelp-3.14.0.tar.xz
-/devhelp-3.15.90.tar.xz
-/devhelp-3.15.91.tar.xz
-/devhelp-3.15.92.tar.xz
-/devhelp-3.16.0.tar.xz
-/devhelp-3.16.1.tar.xz
-/devhelp-3.17.3.tar.xz
-/devhelp-3.17.91.tar.xz
-/devhelp-3.18.0.tar.xz
-/devhelp-3.18.1.tar.xz
-/devhelp-3.19.3.tar.xz
-/devhelp-3.19.90.tar.xz
-/devhelp-3.19.92.tar.xz
-/devhelp-3.20.0.tar.xz
-/devhelp-3.21.90.tar.xz
-/devhelp-3.21.91.tar.xz
-/devhelp-3.21.92.tar.xz
-/devhelp-3.22.0.tar.xz
-/devhelp-3.23.91.tar.xz
-/devhelp-3.23.92.tar.xz
-/devhelp-3.24.0.tar.xz
-/devhelp-3.25.1.tar.xz
-/devhelp-3.25.2-56f8389.tar.xz
-/devhelp-3.25.2.tar.xz
-/devhelp-3.25.91.tar.xz
-/devhelp-3.26.0.tar.xz
-/devhelp-3.26.1.tar.xz
-/devhelp-3.27.90.tar.xz
-/devhelp-3.28.0.tar.xz
-/devhelp-3.28.1.tar.xz

SPECS/devhelp.spec

@@ -1,26 +1,31 @@
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name: devhelp
 Epoch: 1
-Version: 3.28.1
+Version: 40.1
-Release: 5%{?dist}
+Release: 1%{?dist}
 Summary: API documentation browser
 
-License: GPLv2+ and LGPL2+
+License: GPLv3+
 URL: https://wiki.gnome.org/Apps/Devhelp
-Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
-
-Patch0: covscan.patch
 
 BuildRequires: chrpath
-BuildRequires: desktop-file-utils >= 0.3
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: gobject-introspection-devel
+BuildRequires: gtk-doc
 BuildRequires: itstool
+BuildRequires: meson
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(webkit2gtk-4.0)
 BuildRequires: libappstream-glib
 
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: devhelp-libs%{?_isa} = %{epoch}:%{version}-%{release}
+
+# https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/21
+Patch10001: 0001-Revert-Revert-Revert-the-introduction-of-the-amtk-li.patch
 
 %description
 Devhelp is an API documentation browser for the GNOME desktop.
@@ -45,58 +50,44 @@ This package contains the development files for the library that can be used
 for embedding devhelp into other applications such as IDEs.
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{tarball_version}
-%patch0 -p1 -b .covscan
 
 %build
-%configure --disable-static --disable-Werror
+%meson \
-make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
+%if 0%{?flatpak}
+    -Dflatpak_build=true \
+%endif
+    -Dgtk_doc=true \
+    -Dplugin_gedit=true \
+    %{nil}
+
+%meson_build
 
 %install
-%make_install
+%meson_install
-
-# Update the screenshot shown in the software center
-#
-# NOTE: It would be *awesome* if this file was pushed upstream.
-#
-# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
-#
-appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml \
-  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/devhelp/a.png 
-
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
 
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/devhelp
 
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/gedit/plugins/__pycache__
-
 %find_lang devhelp --with-gnome
 
-
 %check
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.desktop
 
-%ldconfig_scriptlets libs
-
 %files
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README.md
-%license COPYING
+%license LICENSES/*
 
 %{_bindir}/devhelp
 
 %{_datadir}/applications/org.gnome.Devhelp.desktop
 %{_datadir}/dbus-1/services/org.gnome.Devhelp.service
 %{_datadir}/devhelp
-%{_datadir}/icons/hicolor/16x16/apps/devhelp.png
+%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
-%{_datadir}/icons/hicolor/22x22/apps/devhelp.png
+%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Devhelp.svg
-%{_datadir}/icons/hicolor/24x24/apps/devhelp.png
+%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Devhelp-symbolic.svg
-%{_datadir}/icons/hicolor/32x32/apps/devhelp.png
-%{_datadir}/icons/hicolor/48x48/apps/devhelp.png
-%{_datadir}/icons/hicolor/256x256/apps/devhelp.png
-%{_datadir}/icons/hicolor/symbolic/apps/devhelp-symbolic.svg
 %{_datadir}/metainfo/org.gnome.Devhelp.appdata.xml
 
 %dir %{_libdir}/gedit
@@ -105,29 +96,98 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Devhelp.
 %{_mandir}/man1/devhelp.1*
 
 %files libs -f devhelp.lang
-%{_libdir}/libdevhelp-3.so.5*
+%{_libdir}/libdevhelp-3.so.6*
 %{_libdir}/girepository-1.0/Devhelp-3.0.typelib
-%{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.libdevhelp-3.gschema.xml
 
 %files devel
-%{_includedir}/devhelp-3.0/
+%{_includedir}/devhelp-3/
 %{_libdir}/libdevhelp-3.so
 %{_libdir}/pkgconfig/*
 %{_datadir}/gtk-doc/*
 %{_datadir}/gir-1.0/Devhelp-3.0.gir
 
 %changelog
-* Wed Oct 31 2018 Tomas Popela <tpopela@redhat.com> - 1:3.28.1-5
+* Fri Aug 27 2021 Kalev Lember <klember@redhat.com> - 1:40.1-1
-- Add isa to requires
+- Update to 40.1
-- Resolves: rhbz#1637781
 
-* Tue Oct 09 2018 Tomas Popela <tpopela@redhat.com> - 1:3.28.1-4
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:40.0-3
-- Fix the Coverity scan issues
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Resolves: rhbz#1637781
+  Related: rhbz#1991688
 
-* Mon Oct 08 2018 Tomas Popela <tpopela@redhat.com> - 1:3.28.1-2
+* Mon Jun 14 2021 Eike Rathke <erack@redhat.com> - 1:40.0-2
-- Fix the requires/provides rpmdiff warning
+- Resolves: rhbz#1971430 Update license to GPLv3+
-- Resolves: rhbz#1637052
+
+* Thu Apr 15 2021 Ray Strode <rstrode@redhat.com> - 1:40.0-1
+- Update to 40.0
+- Drop amtk dependency
+  Related: #1948445
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:40~alpha-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 1:40~alpha-1
+- Update to 40.alpha
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.38.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 1:3.38.1-1
+- Update to 3.38.1
+
+* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 1:3.38.0-1
+- Update to 3.38.0
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.37.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 1:3.37.1-1
+- Update to 3.37.1
+
+* Sat Apr 25 2020 Kalev Lember <klember@redhat.com> - 1:3.36.2-1
+- Update to 3.36.2
+
+* Fri Mar 27 2020 Kalev Lember <klember@redhat.com> - 1:3.36.1-1
+- Update to 3.36.1
+
+* Thu Mar 05 2020 Kalev Lember <klember@redhat.com> - 1:3.36.0-1
+- Update to 3.36.0
+
+* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 1:3.35.90-1
+- Update to 3.35.90
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.34.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 1:3.34.0-1
+- Update to 3.34.0
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.32.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 1:3.32.0-1
+- Update to 3.32.0
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.30.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Oct 31 2018 Kalev Lember <klember@redhat.com> - 1:3.30.1-2
+- Fix typo that prevented macro expansion
+
+* Fri Oct 26 2018 Kalev Lember <klember@redhat.com> - 1:3.30.1-1
+- Update to 3.30.1
+
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1:3.30.0-2
+- Rebuilt against fixed atk (#1626575)
+
+* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1:3.30.0-1
+- Update to 3.30.0
+- Switch to the meson build system
+- Use upstream screenshots in appdata
+- Drop ldconfig scriptlets
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.28.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 1:3.28.1-1
 - Update to 3.28.1

covscan.patch

@@ -1,108 +0,0 @@
-diff --git a/src/dh-book-tree.c b/src/dh-book-tree.c
-index e97fe283..7d8f2395 100644
---- a/src/dh-book-tree.c
-+++ b/src/dh-book-tree.c
-@@ -177,7 +177,7 @@ book_tree_find_language_group (DhBookTree  *tree,
-                         g_return_if_reached ();
-                 }
- 
--                if (exact_iter != NULL &&
-+                if (exact_iter != NULL && exact_found &&
-                     g_ascii_strcasecmp (title, language) == 0) {
-                         /* Exact match found! */
-                         *exact_iter = loop_iter;
-@@ -187,7 +187,7 @@ book_tree_find_language_group (DhBookTree  *tree,
-                                 g_free (title);
-                                 return;
-                         }
--                } else if (next_iter != NULL &&
-+                } else if (next_iter != NULL && next_found &&
-                            g_ascii_strcasecmp (title, language) > 0) {
-                         *next_iter = loop_iter;
-                         *next_found = TRUE;
-@@ -252,7 +252,7 @@ book_tree_find_book (DhBookTree        *tree,
- 
-                 /* We can compare pointers directly as we're playing with references
-                  * of the same object */
--                if (exact_iter != NULL &&
-+                if (exact_iter != NULL && exact_found &&
-                     in_tree_book == book) {
-                         *exact_iter = loop_iter;
-                         *exact_found = TRUE;
-diff --git a/src/dh-keyword-model.c b/src/dh-keyword-model.c
-index a0b716f4..6a7fc50d 100644
---- a/src/dh-keyword-model.c
-+++ b/src/dh-keyword-model.c
-@@ -442,6 +442,14 @@ search_single_book (DhBook          *book,
-         return ret;
- }
- 
-+static gint
-+compare_links (gconstpointer a,
-+               gconstpointer b,
-+               gpointer user_data)
-+{
-+        return dh_link_compare (a, b);
-+}
-+
- static GQueue *
- search_books (SearchSettings  *settings,
-               guint            max_hits,
-@@ -486,7 +494,7 @@ search_books (SearchSettings  *settings,
-                 dh_util_queue_concat (ret, book_result);
-         }
- 
--        g_queue_sort (ret, (GCompareDataFunc) dh_link_compare, NULL);
-+        g_queue_sort (ret, (GCompareDataFunc) compare_links, NULL);
-         return ret;
- }
- 
-diff --git a/src/dh-preferences.c b/src/dh-preferences.c
-index 0568c505..ffae33b3 100644
---- a/src/dh-preferences.c
-+++ b/src/dh-preferences.c
-@@ -143,7 +143,7 @@ preferences_bookshelf_find_book (DhPreferences     *prefs,
-                                     -1);
- 
-                 /* We may have reached the start of the next language group here */
--                if (first && !in_list_book) {
-+                if (exact_found && first && !in_list_book) {
-                         *next_iter = loop_iter;
-                         *next_found = TRUE;
-                         return;
-@@ -151,7 +151,7 @@ preferences_bookshelf_find_book (DhPreferences     *prefs,
- 
-                 /* We can compare pointers directly as we're playing with references
-                  * of the same object */
--                if (exact_iter &&
-+                if (exact_iter && exact_found &&
-                     in_list_book == book) {
-                         *exact_iter = loop_iter;
-                         *exact_found = TRUE;
-@@ -160,7 +160,7 @@ preferences_bookshelf_find_book (DhPreferences     *prefs,
-                                 g_object_unref (in_list_book);
-                                 return;
-                         }
--                } else if (next_iter &&
-+                } else if (next_iter && next_found &&
-                            dh_book_cmp_by_title (in_list_book, book) > 0) {
-                         *next_iter = loop_iter;
-                         *next_found = TRUE;
-@@ -223,7 +223,7 @@ preferences_bookshelf_find_language_group (DhPreferences *prefs,
-                         continue;
-                 }
- 
--                if (exact_iter &&
-+                if (exact_iter && exact_found &&
-                     g_ascii_strcasecmp (title, language) == 0) {
-                         /* Exact match found! */
-                         *exact_iter = loop_iter;
-@@ -233,7 +233,7 @@ preferences_bookshelf_find_language_group (DhPreferences *prefs,
-                                 g_free (title);
-                                 return;
-                         }
--                } else if (next_iter &&
-+                } else if (next_iter && next_found &&
-                            g_ascii_strcasecmp (title, language) > 0) {
-                         *next_iter = loop_iter;
-                         *next_found = TRUE;

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

sources

@@ -1 +0,0 @@
-SHA512 (devhelp-3.28.1.tar.xz) = a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b