diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 8e944a949c1876cc7f3fa8676522ac31d2c43237..64e89278264a4dfc142f79cf6137fae056390135 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + # Filter out provides for private libraries %global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkit2gtk-5\\.0/.*\\.so)$ @@ -14,7 +16,7 @@ Name: webkit2gtk3 Version: 2.38.2 -Release: 11 +Release: 12 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -188,8 +190,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0 %build #%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -mkdir -p build-4.0 -pushd build-4.0 %cmake \ -GNinja \ -DPORT=GTK \ @@ -209,17 +209,11 @@ pushd build-4.0 -DUSE_64KB_PAGE_BLOCK=ON \ %endif %endif - .. %{nil} -export NINJA_STATUS="[3/3][%f/%t %es] " -%ninja_build -j16 -popd +%cmake_build %install -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -pushd build-4.0 -%ninja_install -popd +%cmake_install %find_lang WebKit2GTK-4.0 @@ -290,6 +284,9 @@ popd %endif %changelog +* Mon Nov 18 2024 Funda Wang - 2.38.2-12 +- adopt to new cmake macro + * Thu Aug 29 2024 lingsheng - 2.38.2-11 - Modfiy loongarch64 and sw_64 support use all arch diff --git a/webkit2gtk4_1.spec b/webkit2gtk4_1.spec index d4684c4d2d7bc9d2e156539b27953b6691b6927f..dea60fceb39b7d3e710e8155e695063fa55c8264 100644 --- a/webkit2gtk4_1.spec +++ b/webkit2gtk4_1.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + # Filter out provides for private libraries %global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkit2gtk-5\\.0/.*\\.so)$ @@ -14,7 +16,7 @@ Name: webkit2gtk4.1 Version: 2.38.2 -Release: 11 +Release: 12 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -157,8 +159,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %build #%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -mkdir -p build-4.1 -pushd build-4.1 %cmake \ -GNinja \ -DPORT=GTK \ @@ -172,18 +172,13 @@ pushd build-4.1 -DUSE_64KB_PAGE_BLOCK=ON \ %endif %endif - .. %{nil} -export NINJA_STATUS="[2/3][%f/%t %es] " -%ninja_build -j16 -popd +%cmake_build %install #%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -pushd build-4.1 -%ninja_install -popd +%cmake_install %find_lang WebKit2GTK-4.1 @@ -259,6 +254,9 @@ popd %endif %changelog +* Mon Nov 18 2024 Funda Wang - 2.38.2-12 +- adopt to new cmake macro + * Thu Aug 29 2024 lingsheng - 2.38.2-11 - Modfiy loongarch64 and sw_64 support use all arch diff --git a/webkit2gtk5_0.spec b/webkit2gtk5_0.spec index dd508170b90e61fda8a32def3b57152c1589d3d4..81a37bc62ea43c600e4ad7fcee9afcf54ee8088a 100644 --- a/webkit2gtk5_0.spec +++ b/webkit2gtk5_0.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + # Filter out provides for private libraries %global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkit2gtk-5\\.0/.*\\.so)$ @@ -14,7 +16,7 @@ Name: webkit2gtk5.0 Version: 2.38.2 -Release: 11 +Release: 12 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -155,8 +157,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-5.0 %build #%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0 -mkdir -p build-5.0 -pushd build-5.0 %cmake \ -GNinja \ -DPORT=GTK \ @@ -176,18 +176,12 @@ pushd build-5.0 -DUSE_64KB_PAGE_BLOCK=ON \ %endif %endif - .. %{nil} -export NINJA_STATUS="[1/3][%f/%t %es] " -%ninja_build -j16 -popd +%cmake_build %install #%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0 -pushd build-5.0 -%ninja_install -popd - +%cmake_install %find_lang WebKit2GTK-5.0 @@ -259,6 +253,9 @@ popd %endif %changelog +* Mon Nov 18 2024 Funda Wang - 2.38.2-12 +- adopt to new cmake macro + * Thu Aug 29 2024 lingsheng - 2.38.2-11 - Modfiy loongarch64 and sw_64 support use all arch