diff --git a/.gitignore b/.gitignore
index bfac055..f3e3230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
-*.jx
-*.src.rpm
-.build*
-/mesa-*.tar.bz2
-/mesa-*.tar.xz
-x86_64/
-results_mesa/
-mesa-*/
+SOURCES/mesa-25.0.7.tar.xz
+SOURCES/meson-1.7.0.tar.gz
diff --git a/.mesa-compat.metadata b/.mesa-compat.metadata
new file mode 100644
index 0000000..6a0d3c9
--- /dev/null
+++ b/.mesa-compat.metadata
@@ -0,0 +1,2 @@
+7f98eca4670fe20cebb327a0d78f01d76332f861 SOURCES/mesa-25.0.7.tar.xz
+df69d7e60fd4d502d2b717b35d35924c017f3068 SOURCES/meson-1.7.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index c8c630a..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# mesa-compat
-
-The mesa-compat package
diff --git a/0001-c11-threads-fix-build-on-fedora-44.patch b/SOURCES/0001-c11-threads-fix-build-on-fedora-44.patch
similarity index 100%
rename from 0001-c11-threads-fix-build-on-fedora-44.patch
rename to SOURCES/0001-c11-threads-fix-build-on-fedora-44.patch
diff --git a/Mesa-MLAA-License-Clarification-Email.txt b/SOURCES/Mesa-MLAA-License-Clarification-Email.txt
similarity index 100%
rename from Mesa-MLAA-License-Clarification-Email.txt
rename to SOURCES/Mesa-MLAA-License-Clarification-Email.txt
diff --git a/mesa-compat.spec b/SPECS/mesa-compat.spec
similarity index 70%
rename from mesa-compat.spec
rename to SPECS/mesa-compat.spec
index 55bf5fb..d322e36 100644
--- a/mesa-compat.spec
+++ b/SPECS/mesa-compat.spec
@@ -1,3 +1,13 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.6.5)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 2;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
 %global origname mesa
 
 # We've gotten a report that enabling LTO for mesa breaks some games. See
@@ -8,7 +18,7 @@
 Name:           %{origname}-compat
 Summary:        Mesa graphics libraries - legacy compatibility libraries
 %global ver 25.0.7
-Version:        %{gsub %ver - ~}
+Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        %autorelease
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
 URL:            http://www.mesa3d.org
@@ -19,10 +29,14 @@ Source0:        https://archive.mesa3d.org/mesa-%{ver}.tar.xz
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
+# meson >= 1.3.0 is required
+%global meson_ver 1.7.0
+Source2: https://github.com/mesonbuild/meson/releases/download/%{meson_ver}/meson-%{meson_ver}.tar.gz
+
 # fix c11/threads builds problem on f44
 Patch01:        0001-c11-threads-fix-build-on-fedora-44.patch
 
-BuildRequires:  meson >= 1.3.0
+BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
@@ -82,10 +96,25 @@ Provides:       deprecated()
 %{summary}.
 
 %prep
+
+# Extract mesa
 %autosetup -n %{origname}-%{ver} -p1
 cp %{SOURCE1} docs/
 
+# Extract meson
+tar -xvf %{SOURCE2}
+
 %build
+
+# Build meson
+cd meson-%{meson_ver}
+%py3_build
+%py3_install
+%global __meson %{buildroot}%{_bindir}/meson
+export PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib}
+cd -
+
+# Build mesa
 %meson \
   -Dplatforms= \
   -Dosmesa=true \
@@ -122,8 +151,22 @@ cp %{SOURCE1} docs/
 %meson_build
 
 %install
+cd meson-%{meson_ver}
+%py3_install
+%global __meson %{buildroot}%{_bindir}/meson
+export PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib}
+cd -
+
 %meson_install
 
+# Delete files installed by meson
+rm -f  %{buildroot}%{_bindir}/meson
+rm -rf %{buildroot}%{_mandir}/man1/meson.1*
+rm -f  %{buildroot}%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
+rm -f  %{buildroot}%{_datadir}/bash-completion/completions/meson
+rm -f  %{buildroot}%{_datadir}/zsh/site-functions/_meson
+rm -rf %{buildroot}%{python3_sitelib}
+
 # trim some garbage, the mesa base package handles these
 rm -rf %{buildroot}%{_datadir}/drirc.d
 rm -rf %{buildroot}%{_includedir}/GL/gl*.h
@@ -149,4 +192,11 @@ rm -rf %{buildroot}%{_includedir}/KHR
 %{_libdir}/pkgconfig/xatracker.pc
 
 %changelog
-%autochangelog
+## START: Generated by rpmautospec
+* Fri Jan 09 2026 José Expósito <jexposit@redhat.com> - 25.0.7-2
+- Enable gating
+
+* Fri Jan 09 2026 José Expósito <jexposit@redhat.com> - 25.0.7-1
+- Initial commit on c9s Resolves:
+  https://issues.redhat.com/browse/RHEL-132415
+## END: Generated by rpmautospec
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index d353613..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
diff --git a/sources b/sources
deleted file mode 100644
index 47aa479..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (mesa-25.0.7.tar.xz) = 825bbd8bc5507de147488519786c0200afacf97dae621c80ead24b2c5dd55c5a442757ac8452698ae611e9344025465080795cf8f2dc4eb7ce07b5cc521b2b5c