3 changed files with 50 additions and 177 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/vala-0.56.17.tar.xz
+SOURCES/vala-0.48.19.tar.xz
--- a/.vala.metadata
+++ b/.vala.metadata
@ -1 +1 @@
-f57e47828252894f83d6e5e36c482333eabb5cc8 SOURCES/vala-0.56.17.tar.xz
+57ffcc77747a2153453aa6f577deaeb13458eacc SOURCES/vala-0.48.19.tar.xz
--- a/SPECS/vala.spec
+++ b/SPECS/vala.spec
@ -1,34 +1,44 @@
-%global api_ver 0.56
+%global api_ver 0.48
 %global priority 90

 Name:           vala
-Version:        0.56.17
-Release:        4%{?dist}
+Version:        0.48.19
+Release:        1%{?dist}
 Summary:        A modern programming language for GNOME

 # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
-License:        LGPL-2.1-or-later AND BSD-2-Clause
+License:        LGPLv2+ and BSD
 URL:            https://wiki.gnome.org/Projects/Vala
-Source0:        https://download.gnome.org/sources/%{name}/0.56/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/vala/0.48/vala-%{version}.tar.xz

 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  graphviz-devel
 BuildRequires:  libxslt
 BuildRequires:  make
-BuildRequires:  pkgconfig(gobject-2.0)
 # only if Vala source files are patched
 #BuildRequires:  vala

 # for tests
 BuildRequires:  dbus-x11

+# alternatives; remove in F32
+%global vala_binaries vala valac vala-gen-introspect vapigen
+%global vala_manpages valac vala-gen-introspect vapigen
+Requires(pre): %{_sbindir}/alternatives
+
 Requires: libvala%{?_isa} = %{version}-%{release}

 # For GLib-2.0 and GObject-2.0 .gir files
 Requires: gobject-introspection-devel

+# Removed in F25
+Obsoletes: vala-tools < 0.34.0
+Conflicts: vala-tools < 0.34.0
+Provides: vala-tools = %{version}-%{release}
+
 Provides: vala(api) = %{api_ver}

 %description
@ -64,6 +74,8 @@ Summary:        Development files for libvala
 Requires:       libvala%{?_isa} = %{version}-%{release}
 # Renamed in F30
 Provides:       vala-devel = %{version}-%{release}
+Provides:       vala-devel%{?_isa} = %{version}-%{release}
+Obsoletes:      vala-devel < 0.43

 %description -n libvala-devel
 Vala is a new programming language that aims to bring modern programming
@ -77,14 +89,11 @@ necessary for using the %{name} compiler.

 %package        doc
 Summary:        Documentation for %{name}
+License:        LGPLv2+
+
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-# Don't require Devhelp on RHEL 10+ as it won't be available there,
-# but continue to package the documentation in case of it gets packaged
-# in EPEL
-%if ! 0%{?rhel} || 0%{?rhel} < 10
 Requires:       devhelp
-%endif

 %description    doc
 Vala is a new programming language that aims to bring modern programming
@ -98,7 +107,6 @@ This package contains documentation in a devhelp HTML book.
 %package -n     valadoc
 Summary:        Vala documentation generator
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       libvala%{?_isa} = %{version}-%{release}

 %description -n valadoc
 Valadoc is a documentation generator for generating API documentation from Vala
@ -122,13 +130,10 @@ developing applications that use valadoc.


 %build
-# The pre-generated compiler sources do not have the warning downgrades
-# in vala-c99.patch.
-%global build_type_safety_c 0
 %configure
 # Don't use rpath!
 sed -i 's|/lib /usr/lib|/lib /usr/lib /lib64 /usr/lib64|' libtool
-%make_build
+make %{?_smp_mflags}


 %install
@ -140,18 +145,31 @@ echo -e '#!/bin/sh\nexec %{_bindir}/vala-gen-introspect-%{api_ver}-`uname -m` "$
  %{buildroot}%{_bindir}/vala-gen-introspect-%{api_ver}
  chmod +x %{buildroot}%{_bindir}/vala-gen-introspect-%{api_ver}

-find %{buildroot} -name '*.la' -delete
+# own this directory for third-party *.vapi files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi
+find %{buildroot} -name '*.la' -exec rm -f {} ';'


 %check
-# https://gitlab.gnome.org/GNOME/vala/-/issues/1416
-export -n VALAFLAGS
-%make_build check
+make check
+
+
+# Drop the pre script in F32
+%pre
+if [ $1 -gt 1 ] ; then
+    for f in %{vala_binaries};
+    do
+        %{_sbindir}/alternatives --remove-all $f >& /dev/null || :
+    done
+    for f in %{vala_manpages};
+    do
+        %{_sbindir}/alternatives --remove-all $f.1.gz >& /dev/null || :
+    done
+fi


 %files
 %license COPYING
-%doc NEWS README.md
 %{_bindir}/vala
 %{_bindir}/vala-%{api_ver}
 %{_bindir}/valac
@ -201,163 +219,18 @@ export -n VALAFLAGS


 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.56.17-4
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.56.17-3
- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.56.17-3
- Bump release for June 2024 mass rebuild
-
-* Thu Jun 06 2024 Tomas Popela <tpopela@redhat.com> - 0.56.17-2
- Address rpminspect findings and also don't require Devhelp for help as it
-  won't be in RHEL 10.
-
-* Fri Apr 19 2024 David King <amigadave@amigadave.com> - 0.56.17-1
- Update to 0.56.17
-
-* Fri Mar 15 2024 David King <amigadave@amigadave.com> - 0.56.16-1
- Update to 0.56.16
-
-* Mon Mar 04 2024 David King <amigadave@amigadave.com> - 0.56.15-1
- Update to 0.56.15
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Florian Weimer <fweimer@redhat.com> - 0.56.14-3
- Downgrade GCC 14 -Wint-conversion errors to warnings
-
-* Fri Jan 19 2024 Florian Weimer <fweimer@redhat.com> - 0.56.14-2
- Downgrade GCC 14 C type errors to warnings
-
-* Wed Nov 15 2023 Kalev Lember <klember@redhat.com> - 0.56.14-1
- Update to 0.56.14
-
-* Tue Aug 29 2023 Kalev Lember <klember@redhat.com> - 0.56.13-1
- Update to 0.56.13
-
-* Sat Aug 19 2023 Kalev Lember <klember@redhat.com> - 0.56.12-1
- Update to 0.56.12
-
-* Sun Aug 13 2023 Kalev Lember <klember@redhat.com> - 0.56.11-1
- Update to 0.56.11
-
-* Sat Aug 05 2023 Kalev Lember <klember@redhat.com> - 0.56.10-1
- Update to 0.56.10
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sun Jul 02 2023 Kalev Lember <klember@redhat.com> - 0.56.9-1
- Update to 0.56.9
-
-* Tue May 30 2023 Kalev Lember <klember@redhat.com> - 0.56.8-1
- Update to 0.56.8
-
-* Wed Apr 19 2023 David King <amigadave@amigadave.com> - 0.56.7-1
- Update to 0.56.7
-
-* Mon Apr 17 2023 Florian Weimer <fweimer@redhat.com> - 0.56.6-2
- Fix C header for g_chdir, needed by deja-dup
-
-* Fri Apr 07 2023 David King <amigadave@amigadave.com> - 0.56.6-1
- Update to 0.56.6
-
-* Mon Mar 27 2023 David King <amigadave@amigadave.com> - 0.56.5-1
- Update to 0.56.5
-
-* Mon Mar 20 2023 Florian Weimer <fweimer@redhat.com> - 0.56.4-2
- Apply upstream patch to fix C99 issue in generated code (#2179136)
-
-* Thu Mar 09 2023 David King <amigadave@amigadave.com> - 0.56.4-1
- Update to 0.56.4
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 0.56.3-1
- Update to 0.56.3
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 15 2022 Kalev Lember <klember@redhat.com> - 0.56.2-1
- Update to 0.56.2
-
-* Sun Apr 24 2022 David King <amigadave@amigadave.com> - 0.56.1-1
- Update to 0.56.1
-
-* Thu Mar 17 2022 David King <amigadave@amigadave.com> - 0.56.0-1
- Update to 0.56.0
-
-* Mon Mar 07 2022 David King <amigadave@amigadave.com> - 0.55.91-1
- Update to 0.55.91
-
-* Fri Feb 25 2022 David King <amigadave@amigadave.com> - 0.55.90-1
- Update to 0.55.90
-
-* Sun Feb 13 2022 David King <amigadave@amigadave.com> - 0.55.3-1
- Update to 0.55.3
-
-* Sun Jan 30 2022 David King <amigadave@amigadave.com> - 0.55.2-1
- Update to 0.55.2
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.55.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 14 2022 David King <amigadave@amigadave.com> - 0.55.1-1
- Update to 0.55.1
-
-* Sun Jan 09 2022 David King <amigadave@amigadave.com> - 0.54.6-1
- Update to 0.54.6
-
-* Thu Dec 16 2021 David King <amigadave@amigadave.com> - 0.54.5-1
- Update to 0.54.5
-
-* Tue Dec 07 2021 Kalev Lember <klember@redhat.com> - 0.54.4-1
- Update to 0.54.4
-
-* Sun Oct 31 2021 Kalev Lember <klember@redhat.com> - 0.54.3-1
- Update to 0.54.3
-
-* Mon Oct 04 2021 Kalev Lember <klember@redhat.com> - 0.54.2-1
- Update to 0.54.2
-
-* Tue Sep 21 2021 Kalev Lember <klember@redhat.com> - 0.54.1-1
- Update to 0.54.1
-
-* Fri Sep 17 2021 Kalev Lember <klember@redhat.com> - 0.54.0-1
- Update to 0.54.0
-
-* Wed Sep 08 2021 Kalev Lember <klember@redhat.com> - 0.53.2-1
- Update to 0.53.2
-
-* Tue Aug 31 2021 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.53.1-2
- Fix regression with class members access. Resolves: rhbz#1999471
-
-* Mon Aug 23 2021 Kalev Lember <klember@redhat.com> - 0.53.1-1
- Update to 0.53.1
- Drop obsolete vala-tools virtual provide
-
-* Mon Aug 16 2021 Kalev Lember <klember@redhat.com> - 0.52.5-1
- Update to 0.52.5
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.52.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Sun Aug 22 2021 Kalev Lember <klember@redhat.com> - 0.48.19-1
+- Update to 0.48.19

-* Mon Jun 21 2021 Kalev Lember <klember@redhat.com> - 0.52.4-1
- Update to 0.52.4
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.48.17-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Wed May 05 2021 Kalev Lember <klember@redhat.com> - 0.52.3-1
- Update to 0.52.3
+* Fri May 07 2021 Kalev Lember <klember@redhat.com> - 0.48.17-1
+- Update to 0.48.17

-* Tue Apr 13 2021 Kalev Lember <klember@redhat.com> - 0.52.2-1
- Update to 0.52.2
- Drop no longer needed alternatives cleanup pre scripts
- Drop old obsoletes and provides
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.48.15-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Thu Mar 18 2021 Kalev Lember <klember@redhat.com> - 0.48.15-1
 - Update to 0.48.15