INF-613 import bookmarks from system-bookmarks

SOURCES/firefox-redhat-default-prefs.js

@@ -16,6 +16,8 @@ pref("extensions.shownSelectionUI",         true);
 pref("ui.SpellCheckerUnderlineStyle",       1);
 pref("startup.homepage_override_url",       "https://msvsphere-os.ru");
 pref("startup.homepage_welcome_url",        "https://msvsphere-os.ru");
+pref("browser.bookmarks.file",              "/usr/share/bookmarks/default-bookmarks.html");
+pref("browser.places.importBookmarksHTML",  true);
 pref("browser.startup.homepage",            "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html");
 pref("media.gmp-gmpopenh264.provider.enabled",false);
 pref("media.gmp-gmpopenh264.autoupdate",false);

SPECS/firefox.spec

@@ -201,7 +201,7 @@ end}
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        102.9.0
-Release:        3%{?dist}.inferit.1
+Release:        3%{?dist}.inferit.2
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -448,8 +448,8 @@ BuildRequires:  desktop-file-utils
 Requires:       redhat-indexhtml
 
 %if !0%{?flatpak}
-#TODO
+# INF-613  Require system-bookmarks to import bookmarks
-BuildRequires:  system-bookmarks
+Requires:  system-bookmarks
 %endif
 %if %{?system_ffi}
 BuildRequires:  pkgconfig(libffi)
@@ -1162,9 +1162,10 @@ mkdir -p test_results
 %endif
 
 # set up our default bookmarks
-%if !0%{?flatpak}
+# INF-613 Bookmarks import from default-bookmarks.html from system-bookmarks
-%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html
+#%%if !0%{?flatpak}
-%endif
+#%%{__cp} -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/browser/content/browser/default-bookmarks.html
+#%%endif
 
 # Make sure locale works for langpacks
 %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF
@@ -1470,13 +1471,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Sep 15 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 102.9.0-3.inferit.2
+- INF-613 import bookmarks from system-bookmarks (Arkady L. Shane <tigro@msvsphere-os.ru>)
+- Rebuilt for MSVSphere 8.8
+
 * Tue Sep 12 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 102.9.0-3.inferit.1
 - Changed the start page to https://msvsphere-os.ru
 - Rebuilt for MSVSphere 8.8
 
-* Tue Aug 15 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 102.9.0-3.inferit
+* Tue Aug 15 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 102.9.0-3.inferit
 - Added Russian Trusted Root CA
-- Set Yandex as default search provider (Arkady L. Shane <ashejn@msvsphere.ru>)
+- Set Yandex as default search provider (Arkady L. Shane <tigro@msvsphere-os.ru>)
 - Added Russian description and summary for ArcMenu and gnome-software
 - Disable telemetry and geolocation by default
 - Rebuilt for MSVSphere 8.8