August 2024 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/kdevelop-php.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/kdevelop-php.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/kdevelop-php.git/commit/?id=85d2a90…. Change: +ExclusiveArch: %{qt6_qtwebengine_arches} Thanks. Full change: ============ commit 6a13712197507fe3633a69c468454966e19ec9be Author: Steve Cossette <farchord(a)gmail.com> Date: Thu Aug 22 20:29:40 2024 -0400 24.08.0 diff --git a/.gitignore b/.gitignore index 0ff7c5d..e2ad03e 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ /kdev-php-24.05.1.tar.xz /kdev-php-24.05.2.tar.xz /kdev-php-24.07.90.tar.xz +/kdev-php-24.08.0.tar.xz diff --git a/kdevelop-php.spec b/kdevelop-php.spec index 46486c5..b42ce3a 100644 --- a/kdevelop-php.spec +++ b/kdevelop-php.spec @@ -1,6 +1,6 @@ Name: kdevelop-php Summary: Php language and documentation plugins for KDevelop -Version: 24.07.90 +Version: 24.08.0 Release: 1%{?dist} # Most files LGPLv2+/GPLv2+ @@ -64,6 +64,9 @@ BuildRequires: kdevelop-devel = 9:%{version} %changelog +* Thu Aug 22 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-1 +- 24.08.0 + * Fri Aug 16 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 - 24.07.90 diff --git a/sources b/sources index f97438c..7b5b9fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdev-php-24.07.90.tar.xz) = b42632384a7afa9b71c757f0c0dd51abbc7d6ae3c9433116b4bb7b90d4290b2db6cce6e57ec5c8281dab682e526478df5ad83a1b7983d9fd9d9f51ace61965b8 +SHA512 (kdev-php-24.08.0.tar.xz) = 0b7e4f47b20a8b73058dceed4ed3529f02adef5781910f6f67ea8c75e740651b8199f1efcba0bcdf2c5f5bbedbe71bfbeec37f876ee9cf70f3f539c11a64baa7 commit 85d2a904afa860a2d64de6db1892d3f8b129f824 Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Mon Aug 19 18:52:16 2024 -0400 24.07.90 diff --git a/.gitignore b/.gitignore index 16ac729..0ff7c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /kdev-php-24.05.0.tar.xz /kdev-php-24.05.1.tar.xz /kdev-php-24.05.2.tar.xz +/kdev-php-24.07.90.tar.xz diff --git a/kdevelop-php.spec b/kdevelop-php.spec index 4637675..46486c5 100644 --- a/kdevelop-php.spec +++ b/kdevelop-php.spec @@ -1,32 +1,32 @@ -%undefine __cmake_in_source_build - Name: kdevelop-php Summary: Php language and documentation plugins for KDevelop -Version: 24.05.2 -Release: 2%{?dist} +Version: 24.07.90 +Release: 1%{?dist} # Most files LGPLv2+/GPLv2+ License: GPL-2.0-or-later -URL: http://www.kde.org/ +URL: https://kdevelop.org/ Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/kdev-… -BuildRequires: gettext -BuildRequires: kdevelop-pg-qt-devel >= 1.90.91 -BuildRequires: kdevelop-devel >= %{version} +# kdevelop depends on qt6-qtwebengine, which is only available on some arches +ExclusiveArch: %{qt6_qtwebengine_arches} -BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules -BuildRequires: grantlee-qt5-devel -BuildRequires: kf5-knotifyconfig-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-kdelibs4support-devel -BuildRequires: kf5-threadweaver-devel -BuildRequires: kf5-ktexteditor-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kcmutils-devel - -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtwebkit-devel +BuildRequires: gcc-c++ +BuildRequires: kf6-rpm-macros + +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Test) + +BuildRequires: cmake(KF6ThreadWeaver) +BuildRequires: cmake(KF6TextEditor) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6KCMUtils) + +BuildRequires: cmake(KDevPlatform) >= 6.0 +BuildRequires: cmake(KDevelop-PG-Qt) >= 2.3.0 +BuildRequires: kdevelop-devel = 9:%{version} %{?kdevelop_requires} @@ -39,7 +39,7 @@ BuildRequires: qt5-qtwebkit-devel %build -%{cmake_kf5} +%cmake_kf6 %cmake_build @@ -48,21 +48,25 @@ BuildRequires: qt5-qtwebkit-devel # TODO Enable translations in stable build %find_lang %{name} --all-name + + %files -f %{name}.lang %doc AUTHORS %license LICENSES/* %{_datadir}/kdevappwizard/ %{_datadir}/kdevphpsupport/ -%{_datadir}/kservices5/*.desktop %{_includedir}/kdev-php/* %{_libdir}/libkdevphp*.so %{_libdir}/cmake/KDevPHP/*.cmake -%{_kf5_qtplugindir}/kdevplatform/ -%{_datadir}/qlogging-categories5/kdevphpsupport.categories -%{_datadir}/metainfo/org.kde.kdev-php.metainfo.xml +%{_kf6_qtplugindir}/kdevplatform/ +%{_datadir}/qlogging-categories6/kdevphpsupport.categories +%{_kf6_metainfodir}/org.kde.kdev-php.metainfo.xml %changelog +* Fri Aug 16 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 +- 24.07.90 + * Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e33fc96..f97438c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdev-php-24.05.2.tar.xz) = 6da350a854786ecebf51425455f0604a886ff467080bd945725a3efb3983ed4f5643cb93688487ce6e553cdf62d5b7494e7f08bd3d6509496fbe7968a8ca43bf +SHA512 (kdev-php-24.07.90.tar.xz) = b42632384a7afa9b71c757f0c0dd51abbc7d6ae3c9433116b4bb7b90d4290b2db6cce6e57ec5c8281dab682e526478df5ad83a1b7983d9fd9d9f51ace61965b8 commit 346f1c754d4099099d7cad96e3f67bd5bf50acb1 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 18 11:34:46 2024 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/kdevelop-php.spec b/kdevelop-php.spec index 881f279..4637675 100644 --- a/kdevelop-php.spec +++ b/kdevelop-php.spec @@ -3,7 +3,7 @@ Name: kdevelop-php Summary: Php language and documentation plugins for KDevelop Version: 24.05.2 -Release: 1%{?dist} +Release: 2%{?dist} # Most files LGPLv2+/GPLv2+ License: GPL-2.0-or-later @@ -63,6 +63,9 @@ BuildRequires: qt5-qtwebkit-devel %changelog +* Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jul 07 2024 Marc Deop i Argemí <marcdeop(a)fedoraproject.org> - 24.05.2-1 - 24.05.2

1 0

Architecture specific change in rpms/kdevelop.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/kdevelop.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/kdevelop.git/commit/?id=63ec03472fa…. Change: -%ifarch %{ix86} x86_64 ppc ppc64 s390x Thanks. Full change: ============ commit bb9822c6e42d92e498d360336240ef18324339a2 Author: Steve Cossette <farchord(a)gmail.com> Date: Fri Aug 23 07:58:50 2024 -0400 24.08.0 diff --git a/.gitignore b/.gitignore index a15a5dd..a9ee418 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /kdevelop-24.05.1.tar.xz /kdevelop-24.05.2.tar.xz /kdevelop-24.07.90.tar.xz +/kdevelop-24.08.0.tar.xz diff --git a/kdevelop.spec b/kdevelop.spec index 6a4c036..6d359de 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -3,7 +3,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 24.07.90 +Version: 24.08.0 Release: 1%{?dist} License: GPL-2.0-only URL: https://www.kdevelop.org/ @@ -234,6 +234,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.kde.kdevel %{rpm_macros_dir}/macros.kdevelop %changelog +* Fri Aug 23 2024 Steve Cossette <farchord(a)gmail.com> - 9:24.08.0-1 +- 24.08.0 + * Thu Aug 15 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 9:24.07.90-1 - 24.07.90 diff --git a/sources b/sources index 490d2f1..a9c6d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdevelop-24.07.90.tar.xz) = 2dde016a90b54ee848f94266c399ff636cb4333591ab7bb410bd96b8a22d435c27e5502abf7af46ef2e235e849f5f8b14f1ed05e3d379c1e0b30edb049741ff7 +SHA512 (kdevelop-24.08.0.tar.xz) = b5c116cf8dde83e51bcd5c3445129f91233bc0314c18b85d3f5e48f2ac8433930594ef3f9d4d1330fd761beb93d2b91999c2344c3f41241214828a1f20226e6c commit 63ec03472facaf70408c7774a5e14e42b92a03d7 Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Mon Aug 19 18:32:54 2024 -0400 24.07.90 diff --git a/.gitignore b/.gitignore index 1592349..a15a5dd 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /kdevelop-24.05.0.tar.xz /kdevelop-24.05.1.tar.xz /kdevelop-24.05.2.tar.xz +/kdevelop-24.07.90.tar.xz diff --git a/kdevelop.spec b/kdevelop.spec index e0ce55f..6a4c036 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,108 +1,114 @@ %bcond svn %{undefined flatpak} -%undefine __cmake_in_source_build Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 24.05.2 -Release: 3%{?dist} +Version: 24.07.90 +Release: 1%{?dist} License: GPL-2.0-only -URL: http://www.kdevelop.org/ - +URL: https://www.kdevelop.org/ Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{nam… %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Source10: macros.kdevelop -Patch0: kdevelop-5.2.3-qmake.patch # upstreamable patches # upstream patches +# depends on qt6-qtwebengine, which is only available on some arches +ExclusiveArch: %{qt6_qtwebengine_arches} + BuildRequires: gcc-c++ gcc -BuildRequires: boost-devel -BuildRequires: meson BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: shared-mime-info -BuildRequires: llvm-devel -BuildRequires: clang-devel -BuildRequires: okteta-devel -BuildRequires: pcre-devel -%if %{with svn} -BuildRequires: subversion-devel -%endif -BuildRequires: kdevelop-pg-qt-devel >= 2.0 -BuildRequires: grantlee-qt5-devel - -%{?grantlee5_requires} -BuildRequires: astyle-devel -BuildRequires: libkomparediff2-devel -BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules -BuildRequires: kf5-karchive-devel -BuildRequires: kf5-kconfig-devel -BuildRequires: kf5-kguiaddons-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kitemmodels-devel -BuildRequires: kf5-kitemviews-devel -BuildRequires: kf5-kjobwidgets-devel -BuildRequires: kf5-kcmutils-devel -BuildRequires: kf5-kio-devel -BuildRequires: kf5-kdoctools-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-knotifications-devel -BuildRequires: kf5-knotifyconfig-devel -BuildRequires: kf5-kparts-devel -BuildRequires: kf5-kservice-devel -BuildRequires: kf5-ktexteditor-devel -BuildRequires: kf5-threadweaver-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kf5-kdeclarative-devel -BuildRequires: kf5-kxmlgui-devel -BuildRequires: kf5-plasma-devel -BuildRequires: kf5-krunner-devel -BuildRequires: kf5-kcrash-devel -BuildRequires: kf5-purpose-devel - -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel -%ifarch %{qt5_qtwebengine_arches} -BuildRequires: qt5-qtwebengine-devel -%else -BuildRequires: qt5-qtwebkit-devel -%endif -BuildRequires: qt5-qtscript-devel -BuildRequires: qt5-qttools-devel +BuildRequires: kf6-rpm-macros +BuildRequires: libappstream-glib + +# top-level library dependencies +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6QuickWidgets) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Test) + +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6DocTools) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6ItemModels) +BuildRequires: cmake(KF6ItemViews) +BuildRequires: cmake(KF6JobWidgets) +BuildRequires: cmake(KF6KCMUtils) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6NewStuff) +BuildRequires: cmake(KF6NotifyConfig) +BuildRequires: cmake(KF6Parts) +BuildRequires: cmake(KF6Service) +BuildRequires: cmake(KF6TextEditor) +BuildRequires: cmake(KF6ThreadWeaver) +BuildRequires: cmake(KF6XmlGui) +BuildRequires: cmake(KF6WindowSystem) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6GuiAddons) +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6Notifications) +BuildRequires: cmake(KF6Sonnet) +BuildRequires: cmake(KF6TextTemplate) +BuildRequires: cmake(KF6TextWidgets) + +BuildRequires: cmake(KSysGuard) +BuildRequires: cmake(KDevelop-PG-Qt) >= 2.3.0 + +BuildRequires: pkgconfig(bash-completion) +BuildRequires: pkgconfig(shared-mime-info) + +# kdevplatform +BuildRequires: boost-devel +# kdevplatform/documentation +BuildRequires: cmake(Qt6WebEngineWidgets) -# For AutoReq cmake-filesystem -BuildRequires: cmake +# app/plasma +BuildRequires: cmake(Plasma) +BuildRequires: cmake(KF6Runner) -# some arches don't have valgrind so we need to disable its support on them -%ifarch %{ix86} x86_64 ppc ppc64 s390x -BuildRequires: valgrind-devel +# plugins/astyle +BuildRequires: astyle-devel +# plugins/clang +BuildRequires: cmake(Clang) +BuildRequires: cmake(LLVM) +# plugins/clazy +BuildRequires: clazy +# plugins/cppcheck +BuildRequires: cppcheck +# plugins/gdb (not yet ported to Qt6) +#BuildRequires: cmake(OktetaGui) +# plugins/heaptrack +BuildRequires: heaptrack +# plugins/meson +BuildRequires: meson +# plugins/patchreview +BuildRequires: cmake(KompareDiff2) +BuildRequires: cmake(KF6Purpose) +# plugins/qthelp +BuildRequires: cmake(Qt6Help) +%if %{with svn} +# plugins/subversion +BuildRequires: subversion-devel %endif -# kdevelop-custom-buildsystem has been merged to kdevelop 4.5.0 -Provides: kdevelop-custom-buildsystem = 9:%{version}-%{release} -Obsoletes: kdevelop-custom-buildsystem < 1.2.1-5 - -Provides: kdevplatform = %{version}-%{release} -Obsoletes: kdevplatform < 5.1.80-1 - -# kdevappwizard/templates/qmake_qt4guiapp moved here -Conflicts: kapptemplate < 16.03.80 - Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: astyle Requires: cmake Requires: clang-tools-extra -Suggests: clazy Requires: cppcheck Requires: git -Requires: meson -Requires: konsole5-part +Requires: konsole-part +Recommends: clazy +Recommends: heaptrack +Recommends: meson %description The KDevelop Integrated Development Environment provides many features @@ -132,18 +138,16 @@ individual needs. %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Provides: kdevplatform-devel = %{version}-%{release} -Obsoletes: kdevplatform-devel < 5.1.80-1 +Requires: cmake(KF6TextEditor) +Requires: cmake(KF6ThreadWeaver) +Requires: cmake(Qt6Core5Compat) +Requires: cmake(Qt6WebEngineWidgets) +Requires: cmake(Qt6Test) %description devel %{summary}. %package libs Summary: %{name} runtime libraries -# helps multilib upgrades -Obsoletes: kdevelop < 9:3.9.95 -Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: kdevplatform-libs = %{version}-%{release} -Obsoletes: kdevplatform-libs < 5.1.80-1 %description libs %{summary}. @@ -152,7 +156,7 @@ Obsoletes: kdevplatform-libs < 5.1.80-1 %autosetup -p1 %build -%{cmake_kf5} +%cmake_kf6 %cmake_build @@ -176,6 +180,8 @@ rm -f %{buildroot}%{_datadir}/kdevplatform/shellutils/.zshrc %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.kde.kdevelop.appdata.xml + %files -f %{name}.lang %doc AUTHORS @@ -195,46 +201,42 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %if %{with svn} %{_datadir}/applications/org.kde.kdevelop_svn.desktop %endif -%{_datadir}/kservices5/*.desktop %{_datadir}/mime/packages/kdevelop.xml %{_datadir}/mime/packages/kdevclang.xml %{_datadir}/mime/packages/kdevgit.xml -%{_datadir}/plasma/plasmoids/kdevelopsessions/* -%{_datadir}/knotifications5/kdevelop.notifyrc +%{_datadir}/plasma/plasmoids/org.kde.kdevelopsessions/* +%{_datadir}/knotifications6/kdevelop.notifyrc %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/metainfo/org.kde.kdevelop.appdata.xml -%{_datadir}/qlogging-categories5/kdevelop.categories -%{_datadir}/qlogging-categories5/kdevplatform.categories -# %%{_datadir}/bash-completion/completions/kdevelop +%{_datadir}/qlogging-categories6/kdevelop.categories +%{_datadir}/qlogging-categories6/kdevplatform.categories +%{_datadir}/bash-completion/completions/kdevelop %{_datadir}/knsrcfiles/kdev*.knsrc %{_docdir}/HTML/*/kdevelop/ -%{_kf5_datadir}/kservicetypes5/kdevelopplugin.desktop -%{_qt5_qmldir}/org/kde/plasma/private/kdevelopsessions/libkdevelopsessionsplugin.so -%{_qt5_qmldir}/org/kde/plasma/private/kdevelopsessions/qmldir - -%ldconfig_scriptlets libs +%{_metainfodir}/org.kde.kdevelop.appdata.xml +%{_metainfodir}/org.kde.kdevelopsessions.appdata.xml +%{_qt6_qmldir}/org/kde/plasma/private/kdevelopsessions/libkdevelopsessionsplugin.so +%{_qt6_qmldir}/org/kde/plasma/private/kdevelopsessions/qmldir %files libs -%{_libdir}/lib*.so.* -%{_libdir}/*.so -%{_libdir}/libKDevClangPrivate.so* -%{_kf5_qtplugindir}/kf5/krunner/krunner_kdevelopsessions.so -%{_kf5_qtplugindir}/kdevplatform/ -%{_kf5_qtplugindir}/grantlee/%{grantlee5_plugins}/kdev_filters.so -# FIXME/TODO: does not use standard %%{?grantlee5_plugindir}, is that a problem? -- rex -%dir %{_kf5_qtplugindir}/grantlee/ -%dir %{_kf5_qtplugindir}/grantlee/%{grantlee5_plugins}/ -%{_qt5_qmldir}/org/kde/kdevplatform/ +%{_libdir}/libKDev*.so.{60,6.*} +%{_libdir}/libKDevelopSessionsWatch.so +%{_kf6_qtplugindir}/kdevplatform/ +%{_kf6_plugindir}/krunner/kdevelopsessions.so +%{_kf6_plugindir}/ktexttemplate/kdev_filters.so %files devel %{_libdir}/cmake/KDevelop/ %{_libdir}/cmake/KDevPlatform %{_includedir}/kdevelop/ %{_includedir}/kdevplatform/ -%{_libdir}/lib*.so +%exclude %{_libdir}/libKDevelopSessionsWatch.so +%{_libdir}/libKDev*.so %{rpm_macros_dir}/macros.kdevelop %changelog +* Thu Aug 15 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 9:24.07.90-1 +- 24.07.90 + * Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 9:24.05.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 20720a3..490d2f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdevelop-24.05.2.tar.xz) = bf262c93bfb19ded1e914732b027275524ca4089f71d72a42ccbf544eb38a15d02051af493d7a545dc37c811b1637459f709c5776e879858640e16b19e0220ae +SHA512 (kdevelop-24.07.90.tar.xz) = 2dde016a90b54ee848f94266c399ff636cb4333591ab7bb410bd96b8a22d435c27e5502abf7af46ef2e235e849f5f8b14f1ed05e3d379c1e0b30edb049741ff7 commit 40266a9b733f4cb8e90dfbe903818c23941a8cd6 Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Tue Jul 23 22:58:07 2024 -0400 Disable subversion in flatpaks Subversion usage nowadays does not justify the troubles in building svn and its dependencies for flatpaks. diff --git a/kdevelop.spec b/kdevelop.spec index 56039da..e0ce55f 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,3 +1,5 @@ +%bcond svn %{undefined flatpak} + %undefine __cmake_in_source_build Name: kdevelop Summary: Integrated Development Environment for C++/C @@ -27,7 +29,9 @@ BuildRequires: llvm-devel BuildRequires: clang-devel BuildRequires: okteta-devel BuildRequires: pcre-devel +%if %{with svn} BuildRequires: subversion-devel +%endif BuildRequires: kdevelop-pg-qt-devel >= 2.0 BuildRequires: grantlee-qt5-devel @@ -188,7 +192,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %{_datadir}/applications/org.kde.kdevelop_bzr.desktop %{_datadir}/applications/org.kde.kdevelop_git.desktop %{_datadir}/applications/org.kde.kdevelop_kdev4.desktop +%if %{with svn} %{_datadir}/applications/org.kde.kdevelop_svn.desktop +%endif %{_datadir}/kservices5/*.desktop %{_datadir}/mime/packages/kdevelop.xml %{_datadir}/mime/packages/kdevclang.xml commit 41e70d01e313e087a420e2abbb77194981ab6cd1 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 18 11:34:25 2024 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/kdevelop.spec b/kdevelop.spec index fc98389..56039da 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -3,7 +3,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 24.05.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-only URL: http://www.kdevelop.org/ @@ -229,6 +229,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %{rpm_macros_dir}/macros.kdevelop %changelog +* Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 9:24.05.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 08 2024 Dan Horák <dan(a)danny.cz> - 9:24.05.2-2 - rebuilt for astyle 3.5.2 (rhbz#2276712)

1 0

Architecture specific change in rpms/ghostwriter.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/ghostwriter.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghostwriter.git/commit/?id=7317681f…. Change: +ExclusiveArch: %{qt6_qtwebengine_arches} Thanks. Full change: ============ commit dda193a68f11540deeec0c460cc9ada9c912a129 Author: Steve Cossette <farchord(a)gmail.com> Date: Thu Aug 22 20:22:05 2024 -0400 24.08.0 diff --git a/ghostwriter.spec b/ghostwriter.spec index 6cd6c46..a6754ec 100644 --- a/ghostwriter.spec +++ b/ghostwriter.spec @@ -1,5 +1,5 @@ Name: ghostwriter -Version: 24.07.90 +Version: 24.08.0 Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0 AND CC-BY-SA-4.0 AND MPL-1.1 AND BSD AND LGPL-3.0-only AND MIT AND ISC @@ -82,6 +82,9 @@ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.d %{_mandir}/man1/ghostwriter.* %changelog +* Thu Aug 22 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-1 +- 24.08.0 + * Wed Aug 14 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 - 24.07.90 diff --git a/sources b/sources index 74a4540..e6787ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ghostwriter-24.07.90.tar.xz) = 22d991f1f49967987e67bafdea5836a17466765abe131c795a854603af0b833512c0bf974e0b0a056785313befb4ef91111b71fee891a8503c1746da663e750b +SHA512 (ghostwriter-24.08.0.tar.xz) = e9ee147ad5b43de4e662c004f99148e8c3d082472ae59344b522682027c8db65816874502991959dba93d852b58287b934dd192064801f7cb0a28e246a845248 commit 7317681fb4511acab947bdea1185a2113d6efe9f Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Thu Aug 15 13:43:48 2024 -0400 24.07.90 diff --git a/ghostwriter.spec b/ghostwriter.spec index 264c1be..6cd6c46 100644 --- a/ghostwriter.spec +++ b/ghostwriter.spec @@ -1,39 +1,37 @@ Name: ghostwriter -Version: 24.05.2 -Release: 2%{?dist} +Version: 24.07.90 +Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0 AND CC-BY-SA-4.0 AND MPL-1.1 AND BSD AND LGPL-3.0-only AND MIT AND ISC Summary: Cross-platform, aesthetic, distraction-free Markdown editor URL: https://invent.kde.org/office/%{name} -Source0: https://download.kde.org/%{stable_kf5}/release-service/%{version}/src/%{nam… +Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{nam… BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros +BuildRequires: kf6-rpm-macros BuildRequires: hunspell-devel -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Sonnet) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KF5DocTools) - -BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Help) -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5WebEngineWidgets) -BuildRequires: cmake(Qt5WebChannel) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF6ConfigWidgets) +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Sonnet) +BuildRequires: cmake(KF6WidgetsAddons) +BuildRequires: cmake(KF6XmlGui) +BuildRequires: cmake(KF6DocTools) + +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6WebChannel) +BuildRequires: cmake(Qt6WebEngineWidgets) +BuildRequires: cmake(Qt6Widgets) Provides: bundled(cmark-gfm) = 0.29.0.gfm.6 Provides: bundled(fontawesome-fonts) = 5.10.2 @@ -47,8 +45,8 @@ Recommends: cmark%{?_isa} Recommends: multimarkdown%{?_isa} Recommends: pandoc%{?_isa} -# Required qt5-qtwebengine is not available on some arches. -ExclusiveArch: %{qt5_qtwebengine_arches} +# Required qt6-qtwebengine is not available on some arches. +ExclusiveArch: %{qt6_qtwebengine_arches} %description Ghostwriter is a text editor for Markdown, which is a plain text markup @@ -63,12 +61,12 @@ or your novel. %autosetup -p1 %build -%cmake_kf5 +%cmake_kf6 %cmake_build %check -appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml +desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.desktop %install %cmake_install @@ -77,13 +75,16 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d %files -f %{name}.lang %doc CHANGELOG.md CONTRIBUTING.md README.md %license COPYING -%{_kf5_bindir}/%{name} -%{_kf5_datadir}/applications/org.kde.%{name}.desktop -%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.* -%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml +%{_kf6_bindir}/%{name} +%{_kf6_datadir}/applications/org.kde.%{name}.desktop +%{_kf6_datadir}/icons/hicolor/*/apps/%{name}.* +%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml %{_mandir}/man1/ghostwriter.* %changelog +* Wed Aug 14 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 +- 24.07.90 + * Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 1087a24..74a4540 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ghostwriter-24.05.2.tar.xz) = 0769bf857c7ab8a67eedaf48029ee0586e8d4394fc77c7bfe21a4d39b58579938371178bbe32c743e0b38305ca1602d824ce5cda18b5be49a28c258f52f10ce3 +SHA512 (ghostwriter-24.07.90.tar.xz) = 22d991f1f49967987e67bafdea5836a17466765abe131c795a854603af0b833512c0bf974e0b0a056785313befb4ef91111b71fee891a8503c1746da663e750b commit 81d32a2c6d5df075c52a89638d11569c47c9e776 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jul 18 02:17:35 2024 +0000 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/ghostwriter.spec b/ghostwriter.spec index 20ceec5..264c1be 100644 --- a/ghostwriter.spec +++ b/ghostwriter.spec @@ -1,6 +1,6 @@ Name: ghostwriter Version: 24.05.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0 AND CC-BY-SA-4.0 AND MPL-1.1 AND BSD AND LGPL-3.0-only AND MIT AND ISC Summary: Cross-platform, aesthetic, distraction-free Markdown editor @@ -84,6 +84,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d %{_mandir}/man1/ghostwriter.* %changelog +* Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Jul 07 2024 Marc Deop i Argemí <marcdeop(a)fedoraproject.org> - 24.05.2-1 - 24.05.2

1 0

Architecture specific change in rpms/mozjs128.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/mozjs128.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mozjs128.git/commit/?id=1c007690e29…. Change: +%ifarch s390 s390x Thanks. Full change: ============ commit 1c007690e29103fda22c88c6eaf878e4b2980f63 Author: František Zatloukal <fzatlouk(a)redhat.com> Date: Fri Aug 23 20:12:53 2024 +0200 Init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..76ea8ae --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/firefox-128.1.0esr.source.tar.xz diff --git a/0001-Skip-failing-tests-on-ppc64-and-s390x.patch b/0001-Skip-failing-tests-on-ppc64-and-s390x.patch new file mode 100644 index 0000000..7689f9f --- /dev/null +++ b/0001-Skip-failing-tests-on-ppc64-and-s390x.patch @@ -0,0 +1,35 @@ +From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Mon, 3 Aug 2020 10:27:00 +0200 +Subject: [PATCH] Skip failing tests on ppc64 and s390x + +ppc64 and s390x: non262/extensions/clone-errors.js +s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js +s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js +--- + js/src/tests/jstests.list | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list +index 73ce42f..1797646 100644 +--- a/js/src/tests/jstests.list ++++ b/js/src/tests/jstests.list +@@ -47,6 +47,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list + skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list + skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list + ++# Crashes on s390x and ppc64, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js ++ ++# Crashes on s390x, ppc64, aarch64 ++skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js ++ ++# Crashes on s390x, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js ++ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1863140 + skip script test262/built-ins/FinalizationRegistry/prototype/register/return-undefined-register-symbol.js + skip script test262/built-ins/FinalizationRegistry/prototype/unregister/unregister-symbol-token.js +-- +2.45.2 + diff --git a/copy-headers.patch b/copy-headers.patch new file mode 100644 index 0000000..dfddcfa --- /dev/null +++ b/copy-headers.patch @@ -0,0 +1,38 @@ +From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Wed, 15 Jul 2020 08:27:39 +0200 +Subject: [PATCH] build: Copy headers on install instead of symlinking + +Patch by Philip Chimento ported forward to mozjs78 +--- + python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py +index 858d4d4..8c229e8 100644 +--- a/python/mozbuild/mozbuild/backend/recursivemake.py ++++ b/python/mozbuild/mozbuild/backend/recursivemake.py +@@ -1533,9 +1533,9 @@ class RecursiveMakeBackend(MakeBackend): + " of srcdir-relative or absolute paths." + ) + +- install_manifest.add_pattern_link(basepath, wild, dest_dir) ++ install_manifest.add_pattern_copy(basepath, wild, dest_dir) + else: +- install_manifest.add_pattern_link(f.srcdir, f, dest_dir) ++ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir) + elif isinstance(f, AbsolutePath): + if not f.full_path.lower().endswith((".dll", ".pdb", ".so")): + raise Exception( +@@ -1546,7 +1546,7 @@ class RecursiveMakeBackend(MakeBackend): + install_manifest.add_optional_exists(dest_file) + absolute_files.append(f.full_path) + else: +- install_manifest.add_link(f.full_path, dest_file) ++ install_manifest.add_copy(f.full_path, dest_file) + else: + install_manifest.add_optional_exists(dest_file) + objdir_files.append(self._pretty_path(f, backend_file)) +-- +2.37.1 + diff --git a/emitter.patch b/emitter.patch new file mode 100644 index 0000000..8d5aafb --- /dev/null +++ b/emitter.patch @@ -0,0 +1,67 @@ +From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Wed, 15 Jul 2020 08:39:47 +0200 +Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir + +--- + python/mozbuild/mozbuild/frontend/emitter.py | 10 --------- + .../mozbuild/test/frontend/test_emitter.py | 22 ------------------- + 2 files changed, 32 deletions(-) + +diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py +index 0b7ccef..a3c7f2f 100644 +--- a/python/mozbuild/mozbuild/frontend/emitter.py ++++ b/python/mozbuild/mozbuild/frontend/emitter.py +@@ -1365,16 +1365,6 @@ class TreeMetadataEmitter(LoggingMixin): + "(resolved to %s)" % (local_include, full_path), + context, + ) +- if ( +- full_path == context.config.topsrcdir +- or full_path == context.config.topobjdir +- ): +- raise SandboxValidationError( +- "Path specified in LOCAL_INCLUDES " +- "(%s) resolves to the topsrcdir or topobjdir (%s), which is " +- "not allowed" % (local_include, full_path), +- context, +- ) + include_obj = LocalInclude(context, local_include) + local_includes.append(include_obj.path.full_path) + yield include_obj +diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +index 99507fc..821de22 100644 +--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py ++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py +@@ -1076,28 +1076,6 @@ class TestEmitterBasic(unittest.TestCase): + + self.assertEqual(local_includes, expected) + +- def test_local_includes_invalid(self): +- """Test that invalid LOCAL_INCLUDES are properly detected.""" +- reader = self.reader("local_includes-invalid/srcdir") +- +- with six.assertRaisesRegex( +- self, +- SandboxValidationError, +- "Path specified in LOCAL_INCLUDES.*resolves to the " +- "topsrcdir or topobjdir", +- ): +- self.read_topsrcdir(reader) +- +- reader = self.reader("local_includes-invalid/objdir") +- +- with six.assertRaisesRegex( +- self, +- SandboxValidationError, +- "Path specified in LOCAL_INCLUDES.*resolves to the " +- "topsrcdir or topobjdir", +- ): +- self.read_topsrcdir(reader) +- + def test_local_includes_file(self): + """Test that a filename can't be used in LOCAL_INCLUDES.""" + reader = self.reader("local_includes-filename") +-- +2.37.1 + diff --git a/firefox-112.0-commasplit.patch b/firefox-112.0-commasplit.patch new file mode 100644 index 0000000..a56aec4 --- /dev/null +++ b/firefox-112.0-commasplit.patch @@ -0,0 +1,76 @@ +--- firefox-111.0.1/build/moz.configure/rust.configure 2023-03-21 06:16:03.000000000 -0700 ++++ firefox-111.0.1/build/moz.configure/rust.configure.new 2023-04-05 08:57:29.403219120 -0700 +@@ -593,7 +593,7 @@ + + # ============================================================== + +-option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags") ++option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False) + set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags)) + + +--- firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py 2023-03-21 06:16:09.000000000 -0700 ++++ firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py.new 2023-04-05 08:57:31.270193468 -0700 +@@ -191,6 +191,10 @@ + to instantiate an option indirectly. Set this to a positive integer to + force the script to look into a deeper stack frame when inferring the + `category`. ++ - `comma_split` specifies whether the value string should be split on ++ commas. The default is True. Setting it False is necessary for things ++ like compiler flags which should be a single string that may contain ++ commas. + """ + + __slots__ = ( +@@ -205,6 +209,7 @@ + "possible_origins", + "category", + "define_depth", ++ "comma_split", + ) + + def __init__( +@@ -218,6 +223,7 @@ + category=None, + help=None, + define_depth=0, ++ comma_split=True, + ): + if not name and not env: + raise InvalidOptionError( +@@ -335,9 +341,10 @@ + self.choices = choices + self.help = help + self.category = category or _infer_option_category(define_depth) ++ self.comma_split = comma_split + + @staticmethod +- def split_option(option): ++ def split_option(option, comma_split=True): + """Split a flag or variable into a prefix, a name and values + + Variables come in the form NAME=values (no prefix). +@@ -350,7 +357,13 @@ + + elements = option.split("=", 1) + name = elements[0] +- values = tuple(elements[1].split(",")) if len(elements) == 2 else () ++ if len(elements) == 2: ++ if comma_split: ++ values = tuple(elements[1].split(",")) ++ else: ++ values = (elements[1],) ++ else: ++ values = () + if name.startswith("--"): + name = name[2:] + if not name.islower(): +@@ -426,7 +439,7 @@ + % (option, origin, ", ".join(self.possible_origins)) + ) + +- prefix, name, values = self.split_option(option) ++ prefix, name, values = self.split_option(option, self.comma_split) + option = self._join_option(prefix, name) + + assert name in (self.name, self.env) diff --git a/fix-soname.patch b/fix-soname.patch new file mode 100644 index 0000000..8323264 --- /dev/null +++ b/fix-soname.patch @@ -0,0 +1,26 @@ +From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Wed, 15 Jul 2020 08:21:47 +0200 +Subject: [PATCH] Add soname switch to linker, regardless of Operating System + +Fix backported from Debian: http://bugs.debian.org/746705 +--- + config/rules.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config/rules.mk b/config/rules.mk +index 90a9946..dc87789 100644 +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -291,6 +291,8 @@ ifeq ($(OS_ARCH),GNU) + OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 + endif + ++EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0 ++ + # + # MINGW32 + # +-- +2.37.1 + diff --git a/icu_sources_data-Write-command-output-to-our-stderr.patch b/icu_sources_data-Write-command-output-to-our-stderr.patch new file mode 100644 index 0000000..8468425 --- /dev/null +++ b/icu_sources_data-Write-command-output-to-our-stderr.patch @@ -0,0 +1,44 @@ +From: Simon McVittie <smcv(a)debian.org> +Date: Mon, 9 Oct 2017 09:23:14 +0100 +Subject: icu_sources_data: Write command output to our stderr + +Saying "See output in /tmp/foobar" is all very well for a developer +build, but on a buildd our /tmp is going to get thrown away after +the build. Just log the usual way instead. +--- + intl/icu_sources_data.py | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 4db52af..d62960d 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -188,21 +188,13 @@ def update_sources(topsrcdir): + + def try_run(name, command, cwd=None, **kwargs): + try: +- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f: +- subprocess.check_call( +- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs +- ) +- except subprocess.CalledProcessError: +- print( +- """Error running "{}" in directory {} +- See output in {}""".format( +- " ".join(command), cwd, f.name +- ), +- file=sys.stderr, ++ subprocess.check_call( ++ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs + ) ++ except subprocess.CalledProcessError: ++ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr) + return False + else: +- os.unlink(f.name) + return True + + +-- +2.31.1 + diff --git a/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch new file mode 100644 index 0000000..8572c21 --- /dev/null +++ b/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch @@ -0,0 +1,29 @@ +From: Simon McVittie <smcv(a)debian.org> +Date: Mon, 9 Oct 2017 09:22:12 +0100 +Subject: icu_sources_data.py: Decouple from Mozilla build system + +mozpack.path is a wrapper around os.path that normalizes path +separators on Windows, but on Unix we only have one path separator +so there's nothing to normalize. Avoid needing to import all of it. +--- + intl/icu_sources_data.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py +index 2936df9..4db52af 100644 +--- a/intl/icu_sources_data.py ++++ b/intl/icu_sources_data.py +@@ -21,7 +21,9 @@ import subprocess + import sys + import tempfile + +-from mozpack import path as mozpath ++# Close enough ++import os.path as mozpath ++mozpath.normsep = lambda p: p + + # The following files have been determined to be dead/unused by a + # semi-automated analysis. You can just remove any of the files below +-- +2.31.1 + diff --git a/init_patch.patch b/init_patch.patch new file mode 100644 index 0000000..28ed1d3 --- /dev/null +++ b/init_patch.patch @@ -0,0 +1,28 @@ +From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Mon, 9 Aug 2021 14:38:58 +0200 +Subject: [PATCH] Don't throw InvalidOptionError on invalid options + +--- + python/mozbuild/mozbuild/configure/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py +index f3167f6..c9e1132 100644 +--- a/python/mozbuild/mozbuild/configure/__init__.py ++++ b/python/mozbuild/mozbuild/configure/__init__.py +@@ -557,10 +557,7 @@ class ConfigureSandbox(dict): + for arg in self._helper: + without_value = arg.split("=", 1)[0] + msg = "Unknown option: %s" % without_value +- if self._help: +- self._logger.warning(msg) +- else: +- raise InvalidOptionError(msg) ++ self._logger.warning(msg) + + # Run the execution queue + for func, args in self._execution_queue: +-- +2.31.1 + diff --git a/known_failures.txt b/known_failures.txt new file mode 100644 index 0000000..f6e3af4 --- /dev/null +++ b/known_failures.txt @@ -0,0 +1,51 @@ +non262/Date/15.9.5.7.js +non262/extensions/clone-errors.js +non262/Intl/available-locales-resolved.js +non262/Intl/available-locales-supported.js +non262/Intl/Collator/big5han-gb2312han.js +non262/Intl/Collator/implicithan.js +non262/Intl/DateTimeFormat/day-period-hour-cycle.js +non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js +non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js +non262/Intl/DateTimeFormat/formatRange-timeZoneName.js +non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js +non262/Intl/DateTimeFormat/related-year.js +non262/Intl/DateTimeFormat/timeZone_backzone.js +non262/Intl/DateTimeFormat/timeZone_version.js +non262/Intl/DisplayNames/calendar.js +non262/Intl/DisplayNames/currency.js +non262/Intl/DisplayNames/language-dialect.js +non262/Intl/ListFormat/conjunction-type.js +non262/Intl/Locale/likely-subtags-generated.js +non262/Intl/Locale/likely-subtags.js +non262/Intl/supportedValuesOf-timeZones-canonical.js +non262/Intl/supportedValuesOf-timeZones.js +test262/built-ins/Date/UTC/fp-evaluation-order.js +test262/built-ins/RegExp/property-escapes/generated/Alphabetic.js +test262/built-ins/RegExp/property-escapes/generated/Assigned.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Letter.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Symbol.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Symbol.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Unassigned.js +test262/built-ins/RegExp/property-escapes/generated/Grapheme_Base.js +test262/built-ins/RegExp/property-escapes/generated/ID_Continue.js +test262/built-ins/RegExp/property-escapes/generated/ID_Start.js +test262/built-ins/RegExp/property-escapes/generated/Ideographic.js +test262/built-ins/RegExp/property-escapes/generated/IDS_Binary_Operator.js +test262/built-ins/RegExp/property-escapes/generated/Script_-_Common.js +test262/built-ins/RegExp/property-escapes/generated/Script_-_Han.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Common.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Han.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Malayalam.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sharada.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sinhala.js +test262/built-ins/RegExp/property-escapes/generated/Sentence_Terminal.js +test262/built-ins/RegExp/property-escapes/generated/Unified_Ideograph.js +test262/built-ins/RegExp/property-escapes/generated/XID_Continue.js +test262/built-ins/RegExp/property-escapes/generated/XID_Start.js +test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js +test262/intl402/Intl/supportedValuesOf/timeZones-accepted-by-DateTimeFormat.js +test262/intl402/Locale/constructor-non-iana-canon.js +test262/intl402/Locale/likely-subtags.js \ No newline at end of file diff --git a/mozjs128.spec b/mozjs128.spec new file mode 100644 index 0000000..57afd96 --- /dev/null +++ b/mozjs128.spec @@ -0,0 +1,245 @@ +%global major 128 + +# LTO - Enable in Release builds, but consider disabling for development as it increases compile time +%global build_with_lto 1 + +# https://bugzilla.redhat.com/show_bug.cgi?id=2304756 +%global toolchain clang + +# Require tests to pass? +%global require_tests 1 + +%if !%{build_with_lto} +# LTO is the default +%define _lto_cflags %{nil} +%endif + +%ifarch %{ix86} +# OOM with LTO on i686 +%global _lto_cflags %{nil} +%endif + +# Big endian platforms +%ifarch ppc ppc64 s390 s390x +%global big_endian 1 +%endif + +Name: mozjs%{major} +Version: 128.1.0 +Release: %autorelease +Summary: SpiderMonkey JavaScript library + +License: MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later +URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey +Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%… + +# Known failures with system libicu +Source1: known_failures.txt + +# Patches from mozjs68, rebased for mozjs78: +Patch01: fix-soname.patch +Patch02: copy-headers.patch +Patch03: tests-increase-timeout.patch +Patch09: icu_sources_data.py-Decouple-from-Mozilla-build-system.patch +Patch10: icu_sources_data-Write-command-output-to-our-stderr.patch + +# Build fixes - https://hg.mozilla.org/mozilla-central/rev/ca36a6c4f8a4a0ddaa033fdbe20836d8… +Patch12: emitter.patch +Patch13: tests-Use-native-TemporaryDirectory.patch + +# Build fixes +Patch14: init_patch.patch +Patch15: remove-sloppy-m4-detection-from-bundled-autoconf.patch + +# tentative patch for RUSTFLAGS parsing issue, taken from firefox package: +# https://bugzilla.redhat.com/show_bug.cgi?id=2184743 +# https://bugzilla.mozilla.org/show_bug.cgi?id=1474486 +Patch16: firefox-112.0-commasplit.patch + +# TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed +Patch20: spidermonkey_checks_disable.patch + +# s390x/ppc64 fixes +#Patch21: 0001-Skip-failing-tests-on-ppc64-and-s390x.patch + +# Tests Fixes +Patch30: tests-Replace-pipes-with-shlex-for-Python-3.13.patch + +BuildRequires: cargo +%if "%{toolchain}" == "clang" +BuildRequires: clang +%endif +BuildRequires: clang-devel +%if "%{toolchain}" == "gcc" +BuildRequires: gcc +BuildRequires: gcc-c++ +%endif +BuildRequires: m4 +BuildRequires: make +%if !0%{?rhel} +BuildRequires: nasm +%endif +BuildRequires: libicu-devel +BuildRequires: llvm +BuildRequires: rust +BuildRequires: rustfmt +BuildRequires: cbindgen +BuildRequires: perl-devel +BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(zlib) +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-six +BuildRequires: readline-devel +BuildRequires: wget +BuildRequires: zip + +%description +SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of +JavaScript. It is intended to be embedded in other applications +that provide host environments for JavaScript. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n firefox-%{version} -p1 + +# Copy out the LICENSE file +cp LICENSE js/src/ + +# Copy out file containing known test failures with system libicu +cp %{SOURCE1} js/src/ + +# Remove zlib directory (to be sure using system version) +rm -rf modules/zlib + +# Remove unneeded bundled stuff +rm -rf js/src/devtools/automation/variants/ +rm -rf js/src/octane/ +rm -rf js/src/ctypes/libffi/ + +# Fixups executable permmissions +chmod -x third_party/rust/bumpalo/src/lib.rs + +%build +# Use bundled autoconf +export M4=m4 +export AWK=awk +export AC_MACRODIR=./build/autoconf/ + +pushd js/src/ +%configure \ + --with-system-icu \ + --with-system-zlib \ + --disable-tests \ + --disable-strip \ + --with-intl-api \ + --enable-readline \ + --enable-shared-js \ + --enable-optimize \ + --disable-debug \ + --enable-pie \ + --disable-jemalloc + +%make_build + +%install +pushd js/src/ +%make_install + +# Fix permissions +chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc + +# Avoid multilib conflicts +case `uname -i` in + i386 | ppc | s390 | sparc ) + wordsize="32" + ;; + x86_64 | ppc64 | s390x | sparc64 ) + wordsize="64" + ;; + *) + wordsize="" + ;; +esac + +if test -n "$wordsize" +then + mv %{buildroot}%{_includedir}/mozjs-%{major}/js-config.h \ + %{buildroot}%{_includedir}/mozjs-%{major}/js-config-$wordsize.h + + cat >%{buildroot}%{_includedir}/mozjs-%{major}/js-config.h <<EOF +#ifndef JS_CONFIG_H_MULTILIB +#define JS_CONFIG_H_MULTILIB + +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +# include "js-config-32.h" +#elif __WORDSIZE == 64 +# include "js-config-64.h" +#else +# error "unexpected value for __WORDSIZE macro" +#endif + +#endif +EOF + +fi + +# Remove unneeded files +rm %{buildroot}%{_bindir}/js%{major}-config +rm %{buildroot}%{_libdir}/libjs_static.ajs + +# Rename library and create symlinks, following fix-soname.patch +mv %{buildroot}%{_libdir}/libmozjs-%{major}.so \ + %{buildroot}%{_libdir}/libmozjs-%{major}.so.0.0.0 +ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0 +ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so + +# Executable bit +chmod -x %{buildroot}%{_includedir}/mozjs-%{major}/js/ProfilingCategoryList.h +chmod -x %{buildroot}%{_includedir}/mozjs-%{major}/js-config.h + +%check +pushd js/src/ +# Run SpiderMonkey tests +%if 0%{?require_tests} +%{python3} tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} +%else +%{python3} tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || : +%endif + +# Run basic JIT tests +%if 0%{?require_tests} + +# large-arraybuffers/basic.js fails on s390x +%ifarch s390 s390x +%{python3} jit-test/jit_test.py -s -t 2400 --no-progress -x large-arraybuffers/basic.js ../../js/src/dist/bin/js%{major} basic +%else +%{python3} jit-test/jit_test.py -s -t 2400 --no-progress ../../js/src/dist/bin/js%{major} basic +%endif + +%else +%{python3} jit-test/jit_test.py -s -t 2400 --no-progress ../../js/src/dist/bin/js%{major} basic || : +%endif + +%files +%doc js/src/README.html +%license js/src/LICENSE +%{_libdir}/libmozjs-%{major}.so.0* + +%files devel +%{_bindir}/js%{major} +%{_libdir}/libmozjs-%{major}.so +%{_libdir}/pkgconfig/*.pc +%{_includedir}/mozjs-%{major}/ + +%changelog +%autochangelog diff --git a/remove-sloppy-m4-detection-from-bundled-autoconf.patch b/remove-sloppy-m4-detection-from-bundled-autoconf.patch new file mode 100644 index 0000000..10b8b16 --- /dev/null +++ b/remove-sloppy-m4-detection-from-bundled-autoconf.patch @@ -0,0 +1,29 @@ +From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Mon, 9 Aug 2021 16:15:37 +0200 +Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf + +--- + build/autoconf/autoconf.sh | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh +index ceb8a25..606c74e 100644 +--- a/build/autoconf/autoconf.sh ++++ b/build/autoconf/autoconf.sh +@@ -114,12 +114,6 @@ fi + + # Use the frozen version of Autoconf if available. + r= f= +-# Some non-GNU m4's don't reject the --help option, so give them /dev/null. +-case `$M4 --help < /dev/null 2>&1` in +-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; +-*traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; +-esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || + { rm -f $tmpin $tmpout; exit 2; } +-- +2.31.1 + diff --git a/sources b/sources new file mode 100644 index 0000000..b957e25 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (firefox-128.1.0esr.source.tar.xz) = 8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388 diff --git a/spidermonkey_checks_disable.patch b/spidermonkey_checks_disable.patch new file mode 100644 index 0000000..451d3ee --- /dev/null +++ b/spidermonkey_checks_disable.patch @@ -0,0 +1,22 @@ +From 6ebe8ce6a3267c96454de3cd453269b4c4053a3e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Mon, 9 Aug 2021 14:41:14 +0200 +Subject: [PATCH] Don't die on SpiderMonkey checks + +--- + config/run_spidermonkey_checks.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/config/run_spidermonkey_checks.py b/config/run_spidermonkey_checks.py +index 0f842d9..b49db52 100644 +--- a/config/run_spidermonkey_checks.py ++++ b/config/run_spidermonkey_checks.py +@@ -11,5 +11,3 @@ import sys + def main(output, lib_file, *scripts): + for script in scripts: + retcode = subprocess.call([sys.executable, script], cwd=buildconfig.topsrcdir) +- if retcode != 0: +- raise Exception(script + " failed") +-- +2.31.1 + diff --git a/tests-Replace-pipes-with-shlex-for-Python-3.13.patch b/tests-Replace-pipes-with-shlex-for-Python-3.13.patch new file mode 100644 index 0000000..3f4d440 --- /dev/null +++ b/tests-Replace-pipes-with-shlex-for-Python-3.13.patch @@ -0,0 +1,32 @@ +From dae1848488117166227b00cd7dcadf704b770339 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Wed, 12 Jun 2024 15:56:03 +0200 +Subject: [PATCH] tests: Replace pipes with shlex for Python 3.13 + +--- + js/src/tests/lib/results.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/js/src/tests/lib/results.py b/js/src/tests/lib/results.py +index f902060..ba0c7c6 100644 +--- a/js/src/tests/lib/results.py ++++ b/js/src/tests/lib/results.py +@@ -1,5 +1,5 @@ + import json +-import pipes ++import shlex + import re + + from .progressbar import NullProgressBar, ProgressBar +@@ -9,7 +9,7 @@ from .structuredlog import TestLogger + + + def escape_cmdline(args): +- return " ".join([pipes.quote(a) for a in args]) ++ return " ".join([shlex.quote(a) for a in args]) + + + class TestOutput: +-- +2.45.1 + diff --git a/tests-Use-native-TemporaryDirectory.patch b/tests-Use-native-TemporaryDirectory.patch new file mode 100644 index 0000000..5102312 --- /dev/null +++ b/tests-Use-native-TemporaryDirectory.patch @@ -0,0 +1,65 @@ +From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Tue, 10 Aug 2021 00:00:50 +0200 +Subject: [PATCH] Tests: Use native TemporaryDirectory + +Without ugly wrapper for Py < 3.2 that doesn't work half of the times... +--- + js/src/jit-test/jit_test.py | 2 +- + js/src/tests/jstests.py | 2 +- + js/src/tests/lib/tempfile.py | 16 +--------------- + 3 files changed, 3 insertions(+), 17 deletions(-) + +diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py +index d9f08a7..1824dee 100755 +--- a/js/src/jit-test/jit_test.py ++++ b/js/src/jit-test/jit_test.py +@@ -28,7 +28,7 @@ def add_tests_dir_to_path(): + add_tests_dir_to_path() + + from lib import jittests +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + from lib.tests import ( + change_env, + get_cpu_count, +diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py +index cc11c3d..fff7857 100755 +--- a/js/src/tests/jstests.py ++++ b/js/src/tests/jstests.py +@@ -27,7 +27,7 @@ from subprocess import call, list2cmdline + from lib.adaptor import xdr_annotate + from lib.progressbar import ProgressBar + from lib.results import ResultsSink, TestOutput +-from lib.tempfile import TemporaryDirectory ++from tempfile import TemporaryDirectory + from lib.tests import ( + RefTestCase, + change_env, +diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py +index 604864d..b791387 100644 +--- a/js/src/tests/lib/tempfile.py ++++ b/js/src/tests/lib/tempfile.py +@@ -1,18 +1,4 @@ + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +-try: +- # Python 3.2 +- from tempfile import TemporaryDirectory +-except ImportError: +- import shutil +- import tempfile +- from contextlib import contextmanager +- +- @contextmanager +- def TemporaryDirectory(*args, **kwds): +- d = tempfile.mkdtemp(*args, **kwds) +- try: +- yield d +- finally: +- shutil.rmtree(d) ++from tempfile import TemporaryDirectory +-- +2.41.0 + diff --git a/tests-increase-timeout.patch b/tests-increase-timeout.patch new file mode 100644 index 0000000..5c875a3 --- /dev/null +++ b/tests-increase-timeout.patch @@ -0,0 +1,26 @@ +From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk(a)redhat.com> +Date: Wed, 15 Jul 2020 08:32:44 +0200 +Subject: [PATCH] Increase the test timeout for slower buildds + +Ported forward from Debian: https://bugs.debian.org/878284 +--- + js/src/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +index 6daed72..16db2de 100644 +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -53,7 +53,7 @@ check:: check-js-msg + + check-jstests: + $(PYTHON3) -u $(srcdir)/tests/jstests.py \ +- --no-progress --format=automation --timeout 300 \ ++ --no-progress --format=automation --timeout 600 \ + $(JSTESTS_EXTRA_ARGS) \ + $(DIST)/bin/js$(BIN_SUFFIX) + +-- +2.45.2 +

1 0

Architecture specific change in rpms/umbrello.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/umbrello.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/umbrello.git/commit/?id=c5ca3e807d3…. Change: -%ifnarch s390x Thanks. Full change: ============ commit c5ca3e807d3ab440502bc8f12cad59dd7efff334 Author: Steve Cossette <farchord(a)gmail.com> Date: Fri Aug 23 11:19:54 2024 -0400 Temporarily disable kdevelop integration until umbrello converts over to Qt6 diff --git a/umbrello.spec b/umbrello.spec index 89a87db..9b6d06f 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -1,7 +1,7 @@ Name: umbrello Summary: UML modeler and UML diagram tool Version: 24.08.0 -Release: 1%{?dist} +Release: 2%{?dist} License: CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) URL: https://www.kde.org/applications/development/umbrello/ @@ -41,10 +41,14 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5WebKitWidgets) -%ifnarch s390x -BuildRequires: cmake(KDevelop-PG-Qt) -BuildRequires: cmake(KDevPlatform) -%endif +# Disabled since 24.08: Pulling in kdevelop causes compile to fail +# with foreign qml errors. Reenable when Umbrello is on Qt6. + +#%%ifnarch s390x +#BuildRequires: cmake(KDevelop-PG-Qt) +#BuildRequires: cmake(KDevPlatform) +#%%endif + BuildRequires: cmake(KF5ThreadWeaver) BuildRequires: cmake(KF5KCMUtils) @@ -98,6 +102,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.umbrello. %changelog +* Fri Aug 23 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-2 +- Temporarily disable kdevelop integration until umbrello converts over to Qt6 + * Thu Aug 22 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-1 - 24.08.0 commit 80bd5c518e0a244a014b0c138e18b2082fe985a3 Author: Steve Cossette <farchord(a)gmail.com> Date: Thu Aug 22 20:51:25 2024 -0400 24.08.0 diff --git a/.gitignore b/.gitignore index cdda709..23dd47f 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /umbrello-24.05.0.tar.xz /umbrello-24.05.1.tar.xz /umbrello-24.05.2.tar.xz +/umbrello-24.08.0.tar.xz diff --git a/sources b/sources index f3f7b9c..3eba6af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (umbrello-24.05.2.tar.xz) = 1c35893cf48960289ebbac9a2f26a0b7430f5dcb8e54a9aa5e539a160edd43068fe6e69a673a799feee46079188dfd34ecb11af05a852a35d9f3b066a3e82e74 +SHA512 (umbrello-24.08.0.tar.xz) = 50c2d35cbe33fad39e55ddfaa4d64f9899596dd8eca6d4c45f1b7b04e1320c7de422ae07647b2895d7f4c6e85a408f0a043d4b277144d76cde860dbef72150de diff --git a/umbrello.spec b/umbrello.spec index 3bc0833..89a87db 100644 --- a/umbrello.spec +++ b/umbrello.spec @@ -1,7 +1,7 @@ Name: umbrello Summary: UML modeler and UML diagram tool -Version: 24.05.2 -Release: 2%{?dist} +Version: 24.08.0 +Release: 1%{?dist} License: CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) URL: https://www.kde.org/applications/development/umbrello/ @@ -98,6 +98,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.umbrello. %changelog +* Thu Aug 22 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-1 +- 24.08.0 + * Sat Jul 20 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

1 0

Architecture specific change in rpms/kdevelop-php.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/kdevelop-php.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/kdevelop-php.git/commit/?id=85d2a90…. Change: +ExclusiveArch: %{qt6_qtwebengine_arches} Thanks. Full change: ============ commit 6a13712197507fe3633a69c468454966e19ec9be Author: Steve Cossette <farchord(a)gmail.com> Date: Thu Aug 22 20:29:40 2024 -0400 24.08.0 diff --git a/.gitignore b/.gitignore index 0ff7c5d..e2ad03e 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ /kdev-php-24.05.1.tar.xz /kdev-php-24.05.2.tar.xz /kdev-php-24.07.90.tar.xz +/kdev-php-24.08.0.tar.xz diff --git a/kdevelop-php.spec b/kdevelop-php.spec index 46486c5..b42ce3a 100644 --- a/kdevelop-php.spec +++ b/kdevelop-php.spec @@ -1,6 +1,6 @@ Name: kdevelop-php Summary: Php language and documentation plugins for KDevelop -Version: 24.07.90 +Version: 24.08.0 Release: 1%{?dist} # Most files LGPLv2+/GPLv2+ @@ -64,6 +64,9 @@ BuildRequires: kdevelop-devel = 9:%{version} %changelog +* Thu Aug 22 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-1 +- 24.08.0 + * Fri Aug 16 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 - 24.07.90 diff --git a/sources b/sources index f97438c..7b5b9fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdev-php-24.07.90.tar.xz) = b42632384a7afa9b71c757f0c0dd51abbc7d6ae3c9433116b4bb7b90d4290b2db6cce6e57ec5c8281dab682e526478df5ad83a1b7983d9fd9d9f51ace61965b8 +SHA512 (kdev-php-24.08.0.tar.xz) = 0b7e4f47b20a8b73058dceed4ed3529f02adef5781910f6f67ea8c75e740651b8199f1efcba0bcdf2c5f5bbedbe71bfbeec37f876ee9cf70f3f539c11a64baa7 commit 85d2a904afa860a2d64de6db1892d3f8b129f824 Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Mon Aug 19 18:52:16 2024 -0400 24.07.90 diff --git a/.gitignore b/.gitignore index 16ac729..0ff7c5d 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /kdev-php-24.05.0.tar.xz /kdev-php-24.05.1.tar.xz /kdev-php-24.05.2.tar.xz +/kdev-php-24.07.90.tar.xz diff --git a/kdevelop-php.spec b/kdevelop-php.spec index 4637675..46486c5 100644 --- a/kdevelop-php.spec +++ b/kdevelop-php.spec @@ -1,32 +1,32 @@ -%undefine __cmake_in_source_build - Name: kdevelop-php Summary: Php language and documentation plugins for KDevelop -Version: 24.05.2 -Release: 2%{?dist} +Version: 24.07.90 +Release: 1%{?dist} # Most files LGPLv2+/GPLv2+ License: GPL-2.0-or-later -URL: http://www.kde.org/ +URL: https://kdevelop.org/ Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/kdev-… -BuildRequires: gettext -BuildRequires: kdevelop-pg-qt-devel >= 1.90.91 -BuildRequires: kdevelop-devel >= %{version} +# kdevelop depends on qt6-qtwebengine, which is only available on some arches +ExclusiveArch: %{qt6_qtwebengine_arches} -BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules -BuildRequires: grantlee-qt5-devel -BuildRequires: kf5-knotifyconfig-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-kdelibs4support-devel -BuildRequires: kf5-threadweaver-devel -BuildRequires: kf5-ktexteditor-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kcmutils-devel - -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtwebkit-devel +BuildRequires: gcc-c++ +BuildRequires: kf6-rpm-macros + +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Test) + +BuildRequires: cmake(KF6ThreadWeaver) +BuildRequires: cmake(KF6TextEditor) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6KCMUtils) + +BuildRequires: cmake(KDevPlatform) >= 6.0 +BuildRequires: cmake(KDevelop-PG-Qt) >= 2.3.0 +BuildRequires: kdevelop-devel = 9:%{version} %{?kdevelop_requires} @@ -39,7 +39,7 @@ BuildRequires: qt5-qtwebkit-devel %build -%{cmake_kf5} +%cmake_kf6 %cmake_build @@ -48,21 +48,25 @@ BuildRequires: qt5-qtwebkit-devel # TODO Enable translations in stable build %find_lang %{name} --all-name + + %files -f %{name}.lang %doc AUTHORS %license LICENSES/* %{_datadir}/kdevappwizard/ %{_datadir}/kdevphpsupport/ -%{_datadir}/kservices5/*.desktop %{_includedir}/kdev-php/* %{_libdir}/libkdevphp*.so %{_libdir}/cmake/KDevPHP/*.cmake -%{_kf5_qtplugindir}/kdevplatform/ -%{_datadir}/qlogging-categories5/kdevphpsupport.categories -%{_datadir}/metainfo/org.kde.kdev-php.metainfo.xml +%{_kf6_qtplugindir}/kdevplatform/ +%{_datadir}/qlogging-categories6/kdevphpsupport.categories +%{_kf6_metainfodir}/org.kde.kdev-php.metainfo.xml %changelog +* Fri Aug 16 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 +- 24.07.90 + * Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e33fc96..f97438c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdev-php-24.05.2.tar.xz) = 6da350a854786ecebf51425455f0604a886ff467080bd945725a3efb3983ed4f5643cb93688487ce6e553cdf62d5b7494e7f08bd3d6509496fbe7968a8ca43bf +SHA512 (kdev-php-24.07.90.tar.xz) = b42632384a7afa9b71c757f0c0dd51abbc7d6ae3c9433116b4bb7b90d4290b2db6cce6e57ec5c8281dab682e526478df5ad83a1b7983d9fd9d9f51ace61965b8

1 0

Architecture specific change in rpms/kdevelop.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/kdevelop.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/kdevelop.git/commit/?id=63ec03472fa…. Change: -%ifarch %{ix86} x86_64 ppc ppc64 s390x Thanks. Full change: ============ commit bb9822c6e42d92e498d360336240ef18324339a2 Author: Steve Cossette <farchord(a)gmail.com> Date: Fri Aug 23 07:58:50 2024 -0400 24.08.0 diff --git a/.gitignore b/.gitignore index a15a5dd..a9ee418 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /kdevelop-24.05.1.tar.xz /kdevelop-24.05.2.tar.xz /kdevelop-24.07.90.tar.xz +/kdevelop-24.08.0.tar.xz diff --git a/kdevelop.spec b/kdevelop.spec index 6a4c036..6d359de 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -3,7 +3,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 24.07.90 +Version: 24.08.0 Release: 1%{?dist} License: GPL-2.0-only URL: https://www.kdevelop.org/ @@ -234,6 +234,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.kde.kdevel %{rpm_macros_dir}/macros.kdevelop %changelog +* Fri Aug 23 2024 Steve Cossette <farchord(a)gmail.com> - 9:24.08.0-1 +- 24.08.0 + * Thu Aug 15 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 9:24.07.90-1 - 24.07.90 diff --git a/sources b/sources index 490d2f1..a9c6d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdevelop-24.07.90.tar.xz) = 2dde016a90b54ee848f94266c399ff636cb4333591ab7bb410bd96b8a22d435c27e5502abf7af46ef2e235e849f5f8b14f1ed05e3d379c1e0b30edb049741ff7 +SHA512 (kdevelop-24.08.0.tar.xz) = b5c116cf8dde83e51bcd5c3445129f91233bc0314c18b85d3f5e48f2ac8433930594ef3f9d4d1330fd761beb93d2b91999c2344c3f41241214828a1f20226e6c commit 63ec03472facaf70408c7774a5e14e42b92a03d7 Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Mon Aug 19 18:32:54 2024 -0400 24.07.90 diff --git a/.gitignore b/.gitignore index 1592349..a15a5dd 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /kdevelop-24.05.0.tar.xz /kdevelop-24.05.1.tar.xz /kdevelop-24.05.2.tar.xz +/kdevelop-24.07.90.tar.xz diff --git a/kdevelop.spec b/kdevelop.spec index e0ce55f..6a4c036 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,108 +1,114 @@ %bcond svn %{undefined flatpak} -%undefine __cmake_in_source_build Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 24.05.2 -Release: 3%{?dist} +Version: 24.07.90 +Release: 1%{?dist} License: GPL-2.0-only -URL: http://www.kdevelop.org/ - +URL: https://www.kdevelop.org/ Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{nam… %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Source10: macros.kdevelop -Patch0: kdevelop-5.2.3-qmake.patch # upstreamable patches # upstream patches +# depends on qt6-qtwebengine, which is only available on some arches +ExclusiveArch: %{qt6_qtwebengine_arches} + BuildRequires: gcc-c++ gcc -BuildRequires: boost-devel -BuildRequires: meson BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: shared-mime-info -BuildRequires: llvm-devel -BuildRequires: clang-devel -BuildRequires: okteta-devel -BuildRequires: pcre-devel -%if %{with svn} -BuildRequires: subversion-devel -%endif -BuildRequires: kdevelop-pg-qt-devel >= 2.0 -BuildRequires: grantlee-qt5-devel - -%{?grantlee5_requires} -BuildRequires: astyle-devel -BuildRequires: libkomparediff2-devel -BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules -BuildRequires: kf5-karchive-devel -BuildRequires: kf5-kconfig-devel -BuildRequires: kf5-kguiaddons-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kitemmodels-devel -BuildRequires: kf5-kitemviews-devel -BuildRequires: kf5-kjobwidgets-devel -BuildRequires: kf5-kcmutils-devel -BuildRequires: kf5-kio-devel -BuildRequires: kf5-kdoctools-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-knotifications-devel -BuildRequires: kf5-knotifyconfig-devel -BuildRequires: kf5-kparts-devel -BuildRequires: kf5-kservice-devel -BuildRequires: kf5-ktexteditor-devel -BuildRequires: kf5-threadweaver-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kf5-kdeclarative-devel -BuildRequires: kf5-kxmlgui-devel -BuildRequires: kf5-plasma-devel -BuildRequires: kf5-krunner-devel -BuildRequires: kf5-kcrash-devel -BuildRequires: kf5-purpose-devel - -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel -%ifarch %{qt5_qtwebengine_arches} -BuildRequires: qt5-qtwebengine-devel -%else -BuildRequires: qt5-qtwebkit-devel -%endif -BuildRequires: qt5-qtscript-devel -BuildRequires: qt5-qttools-devel +BuildRequires: kf6-rpm-macros +BuildRequires: libappstream-glib + +# top-level library dependencies +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6QuickWidgets) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Test) + +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6DocTools) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6ItemModels) +BuildRequires: cmake(KF6ItemViews) +BuildRequires: cmake(KF6JobWidgets) +BuildRequires: cmake(KF6KCMUtils) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6NewStuff) +BuildRequires: cmake(KF6NotifyConfig) +BuildRequires: cmake(KF6Parts) +BuildRequires: cmake(KF6Service) +BuildRequires: cmake(KF6TextEditor) +BuildRequires: cmake(KF6ThreadWeaver) +BuildRequires: cmake(KF6XmlGui) +BuildRequires: cmake(KF6WindowSystem) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6GuiAddons) +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6Notifications) +BuildRequires: cmake(KF6Sonnet) +BuildRequires: cmake(KF6TextTemplate) +BuildRequires: cmake(KF6TextWidgets) + +BuildRequires: cmake(KSysGuard) +BuildRequires: cmake(KDevelop-PG-Qt) >= 2.3.0 + +BuildRequires: pkgconfig(bash-completion) +BuildRequires: pkgconfig(shared-mime-info) + +# kdevplatform +BuildRequires: boost-devel +# kdevplatform/documentation +BuildRequires: cmake(Qt6WebEngineWidgets) -# For AutoReq cmake-filesystem -BuildRequires: cmake +# app/plasma +BuildRequires: cmake(Plasma) +BuildRequires: cmake(KF6Runner) -# some arches don't have valgrind so we need to disable its support on them -%ifarch %{ix86} x86_64 ppc ppc64 s390x -BuildRequires: valgrind-devel +# plugins/astyle +BuildRequires: astyle-devel +# plugins/clang +BuildRequires: cmake(Clang) +BuildRequires: cmake(LLVM) +# plugins/clazy +BuildRequires: clazy +# plugins/cppcheck +BuildRequires: cppcheck +# plugins/gdb (not yet ported to Qt6) +#BuildRequires: cmake(OktetaGui) +# plugins/heaptrack +BuildRequires: heaptrack +# plugins/meson +BuildRequires: meson +# plugins/patchreview +BuildRequires: cmake(KompareDiff2) +BuildRequires: cmake(KF6Purpose) +# plugins/qthelp +BuildRequires: cmake(Qt6Help) +%if %{with svn} +# plugins/subversion +BuildRequires: subversion-devel %endif -# kdevelop-custom-buildsystem has been merged to kdevelop 4.5.0 -Provides: kdevelop-custom-buildsystem = 9:%{version}-%{release} -Obsoletes: kdevelop-custom-buildsystem < 1.2.1-5 - -Provides: kdevplatform = %{version}-%{release} -Obsoletes: kdevplatform < 5.1.80-1 - -# kdevappwizard/templates/qmake_qt4guiapp moved here -Conflicts: kapptemplate < 16.03.80 - Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: astyle Requires: cmake Requires: clang-tools-extra -Suggests: clazy Requires: cppcheck Requires: git -Requires: meson -Requires: konsole5-part +Requires: konsole-part +Recommends: clazy +Recommends: heaptrack +Recommends: meson %description The KDevelop Integrated Development Environment provides many features @@ -132,18 +138,16 @@ individual needs. %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Provides: kdevplatform-devel = %{version}-%{release} -Obsoletes: kdevplatform-devel < 5.1.80-1 +Requires: cmake(KF6TextEditor) +Requires: cmake(KF6ThreadWeaver) +Requires: cmake(Qt6Core5Compat) +Requires: cmake(Qt6WebEngineWidgets) +Requires: cmake(Qt6Test) %description devel %{summary}. %package libs Summary: %{name} runtime libraries -# helps multilib upgrades -Obsoletes: kdevelop < 9:3.9.95 -Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: kdevplatform-libs = %{version}-%{release} -Obsoletes: kdevplatform-libs < 5.1.80-1 %description libs %{summary}. @@ -152,7 +156,7 @@ Obsoletes: kdevplatform-libs < 5.1.80-1 %autosetup -p1 %build -%{cmake_kf5} +%cmake_kf6 %cmake_build @@ -176,6 +180,8 @@ rm -f %{buildroot}%{_datadir}/kdevplatform/shellutils/.zshrc %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.kde.kdevelop.appdata.xml + %files -f %{name}.lang %doc AUTHORS @@ -195,46 +201,42 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %if %{with svn} %{_datadir}/applications/org.kde.kdevelop_svn.desktop %endif -%{_datadir}/kservices5/*.desktop %{_datadir}/mime/packages/kdevelop.xml %{_datadir}/mime/packages/kdevclang.xml %{_datadir}/mime/packages/kdevgit.xml -%{_datadir}/plasma/plasmoids/kdevelopsessions/* -%{_datadir}/knotifications5/kdevelop.notifyrc +%{_datadir}/plasma/plasmoids/org.kde.kdevelopsessions/* +%{_datadir}/knotifications6/kdevelop.notifyrc %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/metainfo/org.kde.kdevelop.appdata.xml -%{_datadir}/qlogging-categories5/kdevelop.categories -%{_datadir}/qlogging-categories5/kdevplatform.categories -# %%{_datadir}/bash-completion/completions/kdevelop +%{_datadir}/qlogging-categories6/kdevelop.categories +%{_datadir}/qlogging-categories6/kdevplatform.categories +%{_datadir}/bash-completion/completions/kdevelop %{_datadir}/knsrcfiles/kdev*.knsrc %{_docdir}/HTML/*/kdevelop/ -%{_kf5_datadir}/kservicetypes5/kdevelopplugin.desktop -%{_qt5_qmldir}/org/kde/plasma/private/kdevelopsessions/libkdevelopsessionsplugin.so -%{_qt5_qmldir}/org/kde/plasma/private/kdevelopsessions/qmldir - -%ldconfig_scriptlets libs +%{_metainfodir}/org.kde.kdevelop.appdata.xml +%{_metainfodir}/org.kde.kdevelopsessions.appdata.xml +%{_qt6_qmldir}/org/kde/plasma/private/kdevelopsessions/libkdevelopsessionsplugin.so +%{_qt6_qmldir}/org/kde/plasma/private/kdevelopsessions/qmldir %files libs -%{_libdir}/lib*.so.* -%{_libdir}/*.so -%{_libdir}/libKDevClangPrivate.so* -%{_kf5_qtplugindir}/kf5/krunner/krunner_kdevelopsessions.so -%{_kf5_qtplugindir}/kdevplatform/ -%{_kf5_qtplugindir}/grantlee/%{grantlee5_plugins}/kdev_filters.so -# FIXME/TODO: does not use standard %%{?grantlee5_plugindir}, is that a problem? -- rex -%dir %{_kf5_qtplugindir}/grantlee/ -%dir %{_kf5_qtplugindir}/grantlee/%{grantlee5_plugins}/ -%{_qt5_qmldir}/org/kde/kdevplatform/ +%{_libdir}/libKDev*.so.{60,6.*} +%{_libdir}/libKDevelopSessionsWatch.so +%{_kf6_qtplugindir}/kdevplatform/ +%{_kf6_plugindir}/krunner/kdevelopsessions.so +%{_kf6_plugindir}/ktexttemplate/kdev_filters.so %files devel %{_libdir}/cmake/KDevelop/ %{_libdir}/cmake/KDevPlatform %{_includedir}/kdevelop/ %{_includedir}/kdevplatform/ -%{_libdir}/lib*.so +%exclude %{_libdir}/libKDevelopSessionsWatch.so +%{_libdir}/libKDev*.so %{rpm_macros_dir}/macros.kdevelop %changelog +* Thu Aug 15 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 9:24.07.90-1 +- 24.07.90 + * Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 9:24.05.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 20720a3..490d2f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdevelop-24.05.2.tar.xz) = bf262c93bfb19ded1e914732b027275524ca4089f71d72a42ccbf544eb38a15d02051af493d7a545dc37c811b1637459f709c5776e879858640e16b19e0220ae +SHA512 (kdevelop-24.07.90.tar.xz) = 2dde016a90b54ee848f94266c399ff636cb4333591ab7bb410bd96b8a22d435c27e5502abf7af46ef2e235e849f5f8b14f1ed05e3d379c1e0b30edb049741ff7

1 0

Architecture specific change in rpms/ghostwriter.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/ghostwriter.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghostwriter.git/commit/?id=7317681f…. Change: +ExclusiveArch: %{qt6_qtwebengine_arches} Thanks. Full change: ============ commit dda193a68f11540deeec0c460cc9ada9c912a129 Author: Steve Cossette <farchord(a)gmail.com> Date: Thu Aug 22 20:22:05 2024 -0400 24.08.0 diff --git a/ghostwriter.spec b/ghostwriter.spec index 6cd6c46..a6754ec 100644 --- a/ghostwriter.spec +++ b/ghostwriter.spec @@ -1,5 +1,5 @@ Name: ghostwriter -Version: 24.07.90 +Version: 24.08.0 Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0 AND CC-BY-SA-4.0 AND MPL-1.1 AND BSD AND LGPL-3.0-only AND MIT AND ISC @@ -82,6 +82,9 @@ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.d %{_mandir}/man1/ghostwriter.* %changelog +* Thu Aug 22 2024 Steve Cossette <farchord(a)gmail.com> - 24.08.0-1 +- 24.08.0 + * Wed Aug 14 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 - 24.07.90 diff --git a/sources b/sources index 74a4540..e6787ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ghostwriter-24.07.90.tar.xz) = 22d991f1f49967987e67bafdea5836a17466765abe131c795a854603af0b833512c0bf974e0b0a056785313befb4ef91111b71fee891a8503c1746da663e750b +SHA512 (ghostwriter-24.08.0.tar.xz) = e9ee147ad5b43de4e662c004f99148e8c3d082472ae59344b522682027c8db65816874502991959dba93d852b58287b934dd192064801f7cb0a28e246a845248 commit 7317681fb4511acab947bdea1185a2113d6efe9f Author: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Thu Aug 15 13:43:48 2024 -0400 24.07.90 diff --git a/ghostwriter.spec b/ghostwriter.spec index 264c1be..6cd6c46 100644 --- a/ghostwriter.spec +++ b/ghostwriter.spec @@ -1,39 +1,37 @@ Name: ghostwriter -Version: 24.05.2 -Release: 2%{?dist} +Version: 24.07.90 +Release: 1%{?dist} License: GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0 AND CC-BY-SA-4.0 AND MPL-1.1 AND BSD AND LGPL-3.0-only AND MIT AND ISC Summary: Cross-platform, aesthetic, distraction-free Markdown editor URL: https://invent.kde.org/office/%{name} -Source0: https://download.kde.org/%{stable_kf5}/release-service/%{version}/src/%{nam… +Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{nam… BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: extra-cmake-modules -BuildRequires: kf5-rpm-macros +BuildRequires: kf6-rpm-macros BuildRequires: hunspell-devel -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Sonnet) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(KF5DocTools) - -BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Help) -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5WebEngineWidgets) -BuildRequires: cmake(Qt5WebChannel) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KF6ConfigWidgets) +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Sonnet) +BuildRequires: cmake(KF6WidgetsAddons) +BuildRequires: cmake(KF6XmlGui) +BuildRequires: cmake(KF6DocTools) + +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6WebChannel) +BuildRequires: cmake(Qt6WebEngineWidgets) +BuildRequires: cmake(Qt6Widgets) Provides: bundled(cmark-gfm) = 0.29.0.gfm.6 Provides: bundled(fontawesome-fonts) = 5.10.2 @@ -47,8 +45,8 @@ Recommends: cmark%{?_isa} Recommends: multimarkdown%{?_isa} Recommends: pandoc%{?_isa} -# Required qt5-qtwebengine is not available on some arches. -ExclusiveArch: %{qt5_qtwebengine_arches} +# Required qt6-qtwebengine is not available on some arches. +ExclusiveArch: %{qt6_qtwebengine_arches} %description Ghostwriter is a text editor for Markdown, which is a plain text markup @@ -63,12 +61,12 @@ or your novel. %autosetup -p1 %build -%cmake_kf5 +%cmake_kf6 %cmake_build %check -appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml +desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.desktop %install %cmake_install @@ -77,13 +75,16 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d %files -f %{name}.lang %doc CHANGELOG.md CONTRIBUTING.md README.md %license COPYING -%{_kf5_bindir}/%{name} -%{_kf5_datadir}/applications/org.kde.%{name}.desktop -%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.* -%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml +%{_kf6_bindir}/%{name} +%{_kf6_datadir}/applications/org.kde.%{name}.desktop +%{_kf6_datadir}/icons/hicolor/*/apps/%{name}.* +%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml %{_mandir}/man1/ghostwriter.* %changelog +* Wed Aug 14 2024 Yaakov Selkowitz <yselkowi(a)redhat.com> - 24.07.90-1 +- 24.07.90 + * Thu Jul 18 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 24.05.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 1087a24..74a4540 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ghostwriter-24.05.2.tar.xz) = 0769bf857c7ab8a67eedaf48029ee0586e8d4394fc77c7bfe21a4d39b58579938371178bbe32c743e0b38305ca1602d824ce5cda18b5be49a28c258f52f10ce3 +SHA512 (ghostwriter-24.07.90.tar.xz) = 22d991f1f49967987e67bafdea5836a17466765abe131c795a854603af0b833512c0bf974e0b0a056785313befb4ef91111b71fee891a8503c1746da663e750b

1 0

Architecture specific change in rpms/fcitx5-mozc.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/fcitx5-mozc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/fcitx5-mozc.git/commit/?id=8edf8358…. Change: +ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x %{ix86} Thanks. Full change: ============ commit 8edf8358f856aa9edd9c47f1efc7acf510e3d757 Author: Benjamin A. Beasley <code(a)musicinmybrain.net> Date: Sun Aug 18 11:47:35 2024 -0400 Drop i686 support (Changes/EncourageI686LeafRemoval) diff --git a/fcitx5-mozc.spec b/fcitx5-mozc.spec index 87a1b2e..5a63bc5 100644 --- a/fcitx5-mozc.spec +++ b/fcitx5-mozc.spec @@ -80,7 +80,8 @@ Requires: fcitx5-data # https://bugzilla.redhat.com/show_bug.cgi?id=1419949 # we are using mostly exact mozc server, same problem # may occur here, adding ExcludeArch like ibus-mozc -ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: ppc ppc64 sparcv9 sparc64 s390x %{ix86} %description A wrapper of mozc for fcitx5.

1 0

Architecture specific change in rpms/akmods.git
by githook-noreply＠fedoraproject.org 23 Aug '24

23 Aug '24

The package rpms/akmods.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/akmods.git/commit/?id=cb8200fc744b8…. Change: -%ifarch %{ix86} Thanks. Full change: ============ commit 1e800cdb198eb2066e49e4549b5e723fc16c9d78 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 17:01:15 2024 +0200 Fix parsing multiple kernel diff --git a/akmods b/akmods index b8121a6..d99a7d6 100644 --- a/akmods +++ b/akmods @@ -629,7 +629,7 @@ done init # only check for default_kernel if no value have been parsed -if [ -z ${kernels} ] ; then +if [ -z "${kernels}" ] ; then check_default_kernel fi commit b009ad9ae8a006c32a12ee8320728ef562452749 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 16:53:29 2024 +0200 Use check_kernel_devel return code as appropriate diff --git a/akmods b/akmods index 5b6f305..b8121a6 100644 --- a/akmods +++ b/akmods @@ -268,11 +268,18 @@ check_default_kernel() default_kernel="" fi - check_kernel_devel "${default_kernel}" - - if ! $(echo "${kernels}" | grep -q "${default_kernel}") ; then - kernels="${kernels} ${default_kernel}" + if [[ x${default_kernel} == x"$(uname -r)" ]] ; then + local _kernels="${default_kernel}" + else + local _kernels="${default_kernel} $(uname -r)" fi + + for _kernel in ${_kernels} ; do + if [[ $(check_kernel_devel "${_kernel}" == 0) ]] ; then + kernels="${kernels} ${_kernel}" + fi + done + } buildinstall_kmod() @@ -541,7 +548,10 @@ while [ "${1}" ] ; do exit 1 fi - check_kernel_devel "${1}" + if [[ $(check_kernel_devel "${1}" != 0) ]] ; then + echo "ERROR: kernel or kernel-devel required for ${1}" >&2 + exit 1 + fi # overwrites the default: if [[ ! -n "${kernels}" ]] ; then commit 7a4e1dc503884004588dd4950abc65530f0fb907 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 16:15:20 2024 +0200 Change check_kernel_devel() to return instead of exit diff --git a/akmods b/akmods index 941a72d..5b6f305 100644 --- a/akmods +++ b/akmods @@ -236,15 +236,16 @@ check_kernel_devel() [[ ! -r /lib/modules/"${1}"/build/Makefile ]] ; then echo "Could not find files needed to compile modules for ${1}" echo "Are the development files for kernel ${1} or the appropriate kernel-devel package installed?" - exit 1 + return 1 elif [[ -r /usr/src/kernels/"${1}"/Makefile ]] && \ [[ ! -d /lib/modules/"${1}" ]] ; then # this is a red hat / fedora kernel-devel package, but the kernel for it is not installed # kmodtool would add a dep on that kernel when building; thus when we'd try to install the # rpms we'd run into a missing-dep problem. Thus we prevent that case echo "Kernel ${1} not installed" - exit 1 + return 1 fi + return 0 } check_default_kernel() commit 00476863849ff48829543342f1320ab3d767fffe Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 15:30:17 2024 +0200 akmods --from-init only operates on current kernel diff --git a/akmods b/akmods index e716f14..941a72d 100644 --- a/akmods +++ b/akmods @@ -577,6 +577,8 @@ while [ "${1}" ] ; do # Clean old logs and rpm files from no more installed kmod # packages. cleanup_cachedir + # akmods --from-init only operates on current kernel + kernels="$(uname -r)" shift ;; --from-posttrans|--from-kernel-posttrans|--from-akmod-posttrans) commit 8d2ac12ba19b193ca0b77956a3b30d95518a2884 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 15:27:28 2024 +0200 Deprecate akmods-shutdown script One can still use the akmods-shutdown (non-default) service or run akmods directly diff --git a/akmods-shutdown b/akmods-shutdown index adcf005..ac97e8f 100644 --- a/akmods-shutdown +++ b/akmods-shutdown @@ -23,9 +23,9 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -echo "Building modules for all installed kernels." -for kernel in /usr/src/kernels/* ; do - kernel=$(basename $kernel) - /usr/sbin/akmods --kernels $kernel -done +echo "This akmods-shutdown script is deprecated and will be removed in the future" +echo "Using akmods instead ..." +sleep 6 + +/usr/sbin/akmods diff --git a/akmods-shutdown.service b/akmods-shutdown.service index 7fcccc1..10e8782 100644 --- a/akmods-shutdown.service +++ b/akmods-shutdown.service @@ -7,7 +7,7 @@ Conflicts=shutdown.target Type=oneshot RemainAfterExit=yes ExecStart=/bin/true -ExecStop=-/usr/sbin/akmods-shutdown +ExecStop=-/usr/sbin/akmods TimeoutStopSec=5min [Install] commit 2beab063b9eddfd18771fe4a933f5626614d8470 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 14:24:11 2024 +0200 Bump to akmods 0.5.10 diff --git a/akmods b/akmods index d83d033..e716f14 100644 --- a/akmods +++ b/akmods @@ -37,7 +37,7 @@ # global vars myprog="akmods" -myver="0.5.9" +myver="0.5.10" kmodlogfile= continue_line="" tmpdir= diff --git a/akmods.spec b/akmods.spec index cd58bcd..9e33133 100644 --- a/akmods.spec +++ b/akmods.spec @@ -1,5 +1,5 @@ Name: akmods -Version: 0.5.9 +Version: 0.5.10 Release: %autorelease Summary: Automatic kmods build and install tool commit 1b5754dd1a6d66ddcd9849716e2ca4c7682fd622 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 14:21:44 2024 +0200 Only check for default_kernel is no value - rhbz#2293047 diff --git a/akmods b/akmods index 56189e2..d83d033 100644 --- a/akmods +++ b/akmods @@ -185,27 +185,6 @@ init () } fi - # ensure to build for grub or systemd-boot default kernel - # - # IMPORTANT: "bootctl is-installed" check that systemd-boot is installed only. - # It doesn't check if systemd-boot is the default loader. - # So we assume grubby results if available - if [ ! -h /usr/sbin/grubby ] && command -v grubby >/dev/null 2>&1 ; then - default_kernel=$(grubby --default-kernel | sed -e 's/^.*vmlinuz-//') - elif bootctl is-installed >/dev/null 2>&1 ; then - # Leave jq as optional - isDefault requires systemd 253 - if command -v jq >/dev/null ; then - default_kernel="$(bootctl list --json=short | jq -r '.[] | select(.isDefault).version')" - fi - else # They use neither systemd-boot nor grub2 - echo -n "Unable to figure out the default kernel" >&2 - echo_warning ; echo - default_kernel="" - fi - if ! $(echo "${kernels}" | grep -q "${default_kernel}") ; then - kernels="${kernels} ${default_kernel}" - fi - # needs root permissions if [[ ! -w /var ]] ; then echo -n "Needs to run as root to be able to install rpms." >&2 @@ -250,6 +229,51 @@ init () flock -w 900 99 } + +check_kernel_devel() +{ + if [[ ! -r /usr/src/kernels/"${1}"/Makefile ]] && \ + [[ ! -r /lib/modules/"${1}"/build/Makefile ]] ; then + echo "Could not find files needed to compile modules for ${1}" + echo "Are the development files for kernel ${1} or the appropriate kernel-devel package installed?" + exit 1 + elif [[ -r /usr/src/kernels/"${1}"/Makefile ]] && \ + [[ ! -d /lib/modules/"${1}" ]] ; then + # this is a red hat / fedora kernel-devel package, but the kernel for it is not installed + # kmodtool would add a dep on that kernel when building; thus when we'd try to install the + # rpms we'd run into a missing-dep problem. Thus we prevent that case + echo "Kernel ${1} not installed" + exit 1 + fi +} + +check_default_kernel() +{ + # Ensure to build for grub or systemd-boot default kernel + # + # IMPORTANT: "bootctl is-installed" check that systemd-boot is installed only. + # It doesn't check if systemd-boot is the default loader. + # So we assume grubby results if available + if [ ! -h /usr/sbin/grubby ] && command -v grubby >/dev/null 2>&1 ; then + default_kernel=$(grubby --default-kernel | sed -e 's/^.*vmlinuz-//') + elif bootctl is-installed >/dev/null 2>&1 ; then + # Leave jq as optional - isDefault requires systemd 253 + if command -v jq >/dev/null ; then + default_kernel="$(bootctl list --json=short | jq -r '.[] | select(.isDefault).version')" + fi + else # They use neither systemd-boot nor grub2 + echo -n "Unable to figure out the default kernel" >&2 + echo_warning ; echo + default_kernel="" + fi + + check_kernel_devel "${default_kernel}" + + if ! $(echo "${kernels}" | grep -q "${default_kernel}") ; then + kernels="${kernels} ${default_kernel}" + fi +} + buildinstall_kmod() { local this_kernelver=${1} @@ -514,19 +538,10 @@ while [ "${1}" ] ; do if [[ ! -n "${1}" ]] ; then echo "ERROR: Please provide the kernel-version to build for together with --kernel" >&2 exit 1 - elif [[ ! -r /usr/src/kernels/"${1}"/Makefile ]] && \ - [[ ! -r /lib/modules/"${1}"/build/Makefile ]] ; then - echo "Could not find files needed to compile modules for ${1}" - echo "Are the development files for kernel ${1} or the appropriate kernel-devel package installed?" - exit 1 - elif [[ -r /usr/src/kernels/"${1}"/Makefile ]] && \ - [[ ! -d /lib/modules/"${1}" ]] ; then - # this is a red hat / fedora kernel-devel package, but the kernel for it is not installed - # kmodtool would add a dep on that kernel when building; thus when we'd try to install the - # rpms we'd run into a missing-dep problem. Thus we prevent that case - echo "Kernel ${1} not installed" - exit 1 fi + + check_kernel_devel "${1}" + # overwrites the default: if [[ ! -n "${kernels}" ]] ; then kernels="${1}" @@ -600,6 +615,11 @@ done # sanity checks init +# only check for default_kernel if no value have been parsed +if [ -z ${kernels} ] ; then + check_default_kernel +fi + # go for kernel in ${kernels} ; do check_kmods ${kernel} commit b7fda608ca2bc83c2695e7cf8c3313f8eb905d7b Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 12:34:25 2024 +0200 Revert "Call Init before the argument parser" This reverts commit e1bb15842510275935af959714be82f1067e761f. This is because init assumes root permissions before proceeding. Just move the needed functions out diff --git a/akmods b/akmods index 177c0a2..56189e2 100644 --- a/akmods +++ b/akmods @@ -505,9 +505,6 @@ myprog_help () echo " --akmod <akmod> -- build and install only akmod <akmod>" } -# Call INIT to INIT the defaults, that are overwritten in the argument parser! -init - # first parse command line options while [ "${1}" ] ; do @@ -600,6 +597,9 @@ while [ "${1}" ] ; do esac done +# sanity checks +init + # go for kernel in ${kernels} ; do check_kmods ${kernel} commit 09953db160434babef64cdc5de642cc236ee6033 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 12:10:00 2024 +0200 Switch to use sdubby alternatives to grubby diff --git a/akmods.spec b/akmods.spec index c0376a7..cd58bcd 100644 --- a/akmods.spec +++ b/akmods.spec @@ -82,7 +82,7 @@ Requires: pkgconfig(libelf) # We need grubby or systemd-boot to know the default kernel # On EL7 assumes grubby is there by default - rhbz#2124086 %if 0%{?fedora} || 0%{?rhel} > 7 -Requires: (grubby or systemd-boot) +Requires: (grubby or sdubby) %endif %description commit cb8200fc744b821310f6c8995b6d9722c7972803 Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 12:08:24 2024 +0200 Drop older rhel and use -core diff --git a/akmods.spec b/akmods.spec index 262da7c..c0376a7 100644 --- a/akmods.spec +++ b/akmods.spec @@ -55,35 +55,18 @@ Requires: gzip make sed tar unzip util-linux rpm-build Requires: (kernel-abi-stablelists if kernel-core) %endif -%if 0%{?fedora} || 0%{?rhel} > 7 # We use a virtual provide that would match either # kernel-devel or kernel-PAE-devel Requires: kernel-devel-uname-r # kernel-devel-matched enforces the same kernel version as the -devel -%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} >= 9 Requires: (kernel-debug-devel-matched if kernel-debug-core) Requires: (kernel-devel-matched if kernel-core) -%ifarch %{arm} -Requires: (kernel-lpae-devel-matched if kernel-lpae-core) -%endif %else -Suggests: (kernel-debug-devel if kernel-debug) -Suggests: (kernel-devel if kernel) -%ifarch %{arm} -Suggests: (kernel-lpae-devel if kernel-lpae) -%endif -%endif -%ifarch %{ix86} -Suggests: (kernel-PAE-devel if kernel-PAE) -Suggests: (kernel-PAEdebug-devel if kernel-PAEdebug) -# Theses are from planetccrma-core or rhel-7-server-rt-rpms -Suggests: (kernel-rtPAE-devel if kernel-rtPAE) +Suggests: (kernel-debug-devel if kernel-debug-core) +Suggests: (kernel-devel if kernel-core) %endif Suggests: (kernel-rt-devel if kernel-rt) -%else -# There is no much variant there, so using a sane default -Requires: kernel-devel -%endif # we create a special user that used by akmods to build kmod packages Requires(pre): shadow-utils commit e8b284bcdbfe1a6cd4562da74966de874db43ecf Author: Nicolas Chauvet <kwizart(a)gmail.com> Date: Fri Aug 23 12:04:04 2024 +0200 Drop older rhel cases diff --git a/akmods.spec b/akmods.spec index 3e7035b..262da7c 100644 --- a/akmods.spec +++ b/akmods.spec @@ -52,11 +52,7 @@ Requires: gzip make sed tar unzip util-linux rpm-build # On EL, kABI list was renamed %if 0%{?rhel} -%if 0%{?rhel} >= 8 -Requires: (kernel-abi-stablelists if kernel) -%else -Requires: kernel-abi-whitelists -%endif +Requires: (kernel-abi-stablelists if kernel-core) %endif %if 0%{?fedora} || 0%{?rhel} > 7 commit 9bbb95488246e935705ba9573c5f1776045caa4a Author: Jonathan Wakely <jwakely(a)fedoraproject.org> Date: Mon Aug 19 12:27:22 2024 +0100 Fix bug URLs in man page diff --git a/akmods.h2m b/akmods.h2m index 22f3e55..214d28d 100644 --- a/akmods.h2m +++ b/akmods.h2m @@ -1,9 +1,9 @@ [BUGS] -https://bugzilla.rpmfusion.org/buglist.cgi?product=Fedora&component=akmods&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED +https://bugz.fedoraproject.org/akmods [REPORTING BUGS] Submit a bug against the akmods component at: .br -https://bugzilla.rpmfusion.org/enter_bug.cgi?product=Fedora +https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora [AUTHOR] Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> [MAINTAINER]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes August 2024