From 6bd8199571714c7b16c0d922407288152f3151cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:16:28 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d1459d9dc30ad31bf423d07374820390f13e17a2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 1 Oct 2025 12:07:55 -0400 Subject: [PATCH 2/9] Update to 1.8.1 --- .gitignore | 1 + sources | 2 +- waffle.spec | 30 ++++++++++-------------------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index c88cc4a..d14e3b8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /waffle-1.6.1.tar.xz /waffle-1.7.0.tar.bz2 /waffle-1.8.0.tar.bz2 +/waffle-1.8.1.tar.bz2 diff --git a/sources b/sources index fc34d62..e6167ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waffle-1.8.0.tar.bz2) = 1a78f0e9864bc99fdd0452f65632b5d0c4ed42b99ec6c8b6551c66c018b4effe53ee8bad00cfdd538b5e2250ea02097944e7581592ff6472ff6de8abadd80160 +SHA512 (waffle-1.8.1.tar.bz2) = 9187977c65d499a68833288e2bbb00feae8a56763f654d9a038839c6ff15e94eba416786057a6ca514d0034a8b42fa2abd72e9d9276f4556d35d36cde403f42c diff --git a/waffle.spec b/waffle.spec index 236396c..071deb5 100644 --- a/waffle.spec +++ b/waffle.spec @@ -1,5 +1,6 @@ +%global gitver 49abc7cb5f73cc6852136c91da49ea3a338960e4 Name: waffle -Version: 1.8.0 +Version: 1.8.1 Release: %autorelease Summary: Platform independent GL API layer @@ -7,10 +8,8 @@ License: MIT URL: http://www.waffle-gl.org/releases.html Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.bz2 -Patch0: 0001-wayland-fix-build-against-version-1.20.patch -Patch1: fix-bash.patch - -BuildRequires: cmake libxslt docbook-style-xsl libxcb-devel +BuildRequires: meson ninja-build +BuildRequires: libxslt docbook-style-xsl libxcb-devel BuildRequires: gcc-c++ BuildRequires: libX11-devel mesa-libGL-devel mesa-libGLU-devel BuildRequires: chrpath @@ -54,24 +53,15 @@ Example programs using %{name}. %prep -%autosetup -n waffle-v1.7.0-905c6c10f2483adf0cbfa024e2d3c2ed541fb300 -p1 +%autosetup -n waffle-v%{version}-%{gitver} -p1 %build -%cmake \ - -DCMAKE_INSTALL_DOCDIR:PATH=%{_defaultdocdir}/%{name}-%{version} \ - -DCMAKE_BUILD_STRIP=FALSE \ - -Dwaffle_has_glx=1 -Dwaffle_has_gbm=1 \ - -Dwaffle_has_wayland=1 \ - -Dwaffle_build_manpages=1 -Dwaffle_build_htmldocs=1 - -%cmake_build - -# We don’t want to install binary files in %%docdir -rm -rf examples/CMakeFiles +%meson +%meson_build %install -%cmake_install +%meson_install # Fedora now uses unversioned doc dirs, make install shouldn’t try to # install there anyway. rm -rf %{buildroot}%{_docdir}/%{name}* @@ -85,6 +75,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %{_libdir}/lib%{name}*.so.* %{_bindir}/wflinfo %{_datadir}/bash-completion/completions/wflinfo +%{_datadir}/zsh/site-functions/_wflinfo %files doc %doc doc/html/ @@ -94,8 +85,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}* %{_includedir}/waffle* %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/%{name}* -%{_libdir}/cmake/Waffle/* -%{_mandir}/man*/* +#{_mandir}/man*/* %files examples From c1324c7b2a68815aaa8c002e524bb5f7fb94d34f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:06:13 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 500750be5b5ae3c6df2df077056aac43d0a9cdf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:40:29 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From c97757fe89d5b448afaae14050dd9a2d43195316 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 14:54:41 -0300 Subject: [PATCH 5/9] update to 1.8.3 spec cleanup and modernization fixes rhbz#2505136 waffle: FTBFS in Fedora rawhide/f45 Signed-off-by: Filipe Rosset --- .gitignore | 1 + sources | 2 +- waffle.spec | 62 +++++++++++++++++++++++++++++++---------------------- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d14e3b8..829e62c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /waffle-1.7.0.tar.bz2 /waffle-1.8.0.tar.bz2 /waffle-1.8.1.tar.bz2 +/waffle-1.8.3.tar.xz diff --git a/sources b/sources index e6167ac..bf7ea39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waffle-1.8.1.tar.bz2) = 9187977c65d499a68833288e2bbb00feae8a56763f654d9a038839c6ff15e94eba416786057a6ca514d0034a8b42fa2abd72e9d9276f4556d35d36cde403f42c +SHA512 (waffle-1.8.3.tar.xz) = 6c320e3bab223075da8c4b1a32a24ad857143481f58ab1a39c4e6ace869c5e802cd768cd6186b28abe47c273994188be2b943e5c9fa156941dc5695316859d05 diff --git a/waffle.spec b/waffle.spec index 071deb5..dea408d 100644 --- a/waffle.spec +++ b/waffle.spec @@ -1,26 +1,27 @@ -%global gitver 49abc7cb5f73cc6852136c91da49ea3a338960e4 Name: waffle -Version: 1.8.1 +Version: 1.8.3 Release: %autorelease Summary: Platform independent GL API layer License: MIT URL: http://www.waffle-gl.org/releases.html -Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.bz2 +Source0: https://gitlab.freedesktop.org/mesa/waffle/-/archive/v%{version}/waffle-%{version}.tar.xz -BuildRequires: meson ninja-build -BuildRequires: libxslt docbook-style-xsl libxcb-devel -BuildRequires: gcc-c++ -BuildRequires: libX11-devel mesa-libGL-devel mesa-libGLU-devel -BuildRequires: chrpath -BuildRequires: mesa-libEGL-devel -%if 0%{?rhel} > 6 || 0%{?fedora} > 0 -BuildRequires: mesa-libGLES-devel -BuildRequires: systemd-devel -%endif -BuildRequires: mesa-libgbm-devel -BuildRequires: wayland-devel -BuildRequires: wayland-protocols-devel +BuildRequires: cmake +BuildRequires: docbook-style-xsl +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libX11-devel +BuildRequires: libxcb-devel +BuildRequires: libxslt +BuildRequires: mesa-libEGL-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLES-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: meson +BuildRequires: ninja-build +BuildRequires: wayland-devel +BuildRequires: wayland-protocols-devel %description Waffle is a cross-platform C library that allows one to defer @@ -38,54 +39,63 @@ Contains the header files, and libraries required for development of %package doc Summary: Documentation for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch %description doc Contains HTML version of the developer documentation for development of -%{name}-related software (manpages are in the -devel package). +%{name}-related software (man pages are in the -devel package). %package examples Summary: Example programs using %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch %description examples Example programs using %{name}. %prep -%autosetup -n waffle-v%{version}-%{gitver} -p1 +%autosetup -p1 +ln -sf waffle-1.5.0.txt doc/release-notes/waffle-1.5.0-rc2.txt %build -%meson +%meson -Dbuild-manpages=true %meson_build + %install %meson_install -# Fedora now uses unversioned doc dirs, make install shouldn’t try to +# Fedora now uses unversioned doc dirs, make install shouldn't try to # install there anyway. rm -rf %{buildroot}%{_docdir}/%{name}* -%ldconfig_scriptlets + +%check +%meson_test %files %license LICENSE.txt %doc README.md -%{_libdir}/lib%{name}*.so.* %{_bindir}/wflinfo +%{_libdir}/lib%{name}-1.so.0* %{_datadir}/bash-completion/completions/wflinfo %{_datadir}/zsh/site-functions/_wflinfo +%{_mandir}/man1/wflinfo.1* %files doc %doc doc/html/ %files devel %doc doc/release-notes/ -%{_includedir}/waffle* -%{_libdir}/lib%{name}*.so -%{_libdir}/pkgconfig/%{name}* -#{_mandir}/man*/* +%{_includedir}/waffle-1/ +%{_libdir}/lib%{name}-1.so +%{_libdir}/pkgconfig/%{name}-1.pc +%{_libdir}/cmake/Waffle/ +%{_mandir}/man3/waffle*.3* +%{_mandir}/man7/waffle*.7* %files examples From 7344042b77c740c66969b497551ff09c9fbf5b0c Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 14:55:56 -0300 Subject: [PATCH 6/9] simplify .gitignore file Signed-off-by: Filipe Rosset --- .gitignore | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 829e62c..56991fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1 @@ -/waffle-1.2.3.tar.xz -/waffle-1.3.0.tar.xz -/waffle-1.4.0.tar.xz -/waffle-1.4.2.tar.xz -/waffle-1.5.0.tar.xz -/waffle-1.5.2.tar.xz -/waffle-1.6.1.tar.xz -/waffle-1.7.0.tar.bz2 -/waffle-1.8.0.tar.bz2 -/waffle-1.8.1.tar.bz2 -/waffle-1.8.3.tar.xz +/waffle-*.tar.xz From 2426d0cc4488472d76abeee647d4d32a3e8353f8 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 14:56:20 -0300 Subject: [PATCH 7/9] opt-in to packit for rawhide Signed-off-by: Filipe Rosset --- .packit.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..8c4a334 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: waffle.spec + +copy_upstream_release_description: false + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_committers: ['packit','all_admins'] + dist_git_branches: + - fedora-rawhide + From cd349a9baf784dfa6191fb7a1f24052a3b6b11d7 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 15:27:54 -0300 Subject: [PATCH 8/9] remove noarch tag from examples sub-package --- waffle.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index dea408d..562fd31 100644 --- a/waffle.spec +++ b/waffle.spec @@ -49,7 +49,6 @@ Contains HTML version of the developer documentation for development of %package examples Summary: Example programs using %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -BuildArch: noarch %description examples Example programs using %{name}. From c4a53b3bed1b290ccb6507b698d2e8ce24ca0de5 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 23 Jul 2026 15:42:53 -0300 Subject: [PATCH 9/9] remove noarch tag from doc sub-package --- waffle.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/waffle.spec b/waffle.spec index 562fd31..0201ab9 100644 --- a/waffle.spec +++ b/waffle.spec @@ -39,7 +39,6 @@ Contains the header files, and libraries required for development of %package doc Summary: Documentation for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -BuildArch: noarch %description doc Contains HTML version of the developer documentation for development of