.gitignore

@@ -1 +1 @@
-SOURCES/vala-0.48.19.tar.xz
+SOURCES/vala-0.40.19.tar.xz

.vala.metadata

@@ -1 +1 @@
-57ffcc77747a2153453aa6f577deaeb13458eacc SOURCES/vala-0.48.19.tar.xz
+daf1b36b47edd54cf014f623035e20c750e23a84 SOURCES/vala-0.40.19.tar.xz

SPECS/vala.spec

@@ -1,35 +1,33 @@
-%global api_ver 0.48
+%global api_ver 0.40
 %global priority 90
 
 Name:           vala
-Version:        0.48.19
+Version:        0.40.19
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A modern programming language for GNOME
 
 # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD
 License:        LGPLv2+ and BSD
 URL:            https://wiki.gnome.org/Projects/Vala
-Source0:        https://download.gnome.org/sources/vala/0.48/vala-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/vala/0.40/vala-%{version}.tar.xz
 
-BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  bison
 BuildRequires:  glib2-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  graphviz-devel
 BuildRequires:  libxslt
-BuildRequires:  make
 # only if Vala source files are patched
 #BuildRequires:  vala
 
 # for tests
 BuildRequires:  dbus-x11
 
-# alternatives; remove in F32
+# alternatives
 %global vala_binaries vala valac vala-gen-introspect vapigen
 %global vala_manpages valac vala-gen-introspect vapigen
-Requires(pre): %{_sbindir}/alternatives
+Requires(posttrans):   %{_sbindir}/alternatives
-
+Requires(preun):       %{_sbindir}/alternatives
-Requires: libvala%{?_isa} = %{version}-%{release}
 
 # For GLib-2.0 and GObject-2.0 .gir files
 Requires: gobject-introspection-devel
@@ -57,33 +55,17 @@ The syntax of Vala is similar to C#, modified to better fit the GObject
 type system.
 
 
-%package -n     libvala
+%package        devel
-Summary:        Vala compiler library
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description -n libvala
+%description    devel
 Vala is a new programming language that aims to bring modern programming
 language features to GNOME developers without imposing any additional
 runtime requirements and without using a different ABI compared to
 applications and libraries written in C.
 
-This package contains the shared libvala library.
+This package contains development files for %{name}. This is not
-
-
-%package -n     libvala-devel
-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
-language features to GNOME developers without imposing any additional
-runtime requirements and without using a different ABI compared to
-applications and libraries written in C.
-
-This package contains development files for libvala. This is not
 necessary for using the %{name} compiler.
 
 
@@ -138,6 +120,17 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+# remove symlinks, using alternatives
+for f in %{vala_binaries}
+do
+    rm $RPM_BUILD_ROOT%{_bindir}/$f
+    touch $RPM_BUILD_ROOT%{_bindir}/$f
+done
+for f in %{vala_manpages}
+do
+    rm $RPM_BUILD_ROOT%{_mandir}/man1/$f.1*
+    touch $RPM_BUILD_ROOT%{_mandir}/man1/$f.1.gz
+done
 
 # Avoid multilib conflicts in vala-gen-introspect
 mv %{buildroot}%{_bindir}/vala-gen-introspect-%{api_ver}{,-`uname -m`}
@@ -154,48 +147,56 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 make check
 
 
-# Drop the pre script in F32
+%posttrans
-%pre
+for f in %{vala_binaries};
-if [ $1 -gt 1 ] ; then
+do
-    for f in %{vala_binaries};
+    %{_sbindir}/alternatives --install %{_bindir}/$f \
-    do
+      $f %{_bindir}/$f-%{api_ver} %{priority} || :
-        %{_sbindir}/alternatives --remove-all $f >& /dev/null || :
+done
-    done
+for f in %{vala_manpages};
-    for f in %{vala_manpages};
+do
-    do
+    %{_sbindir}/alternatives --install %{_mandir}/man1/$f.1.gz \
-        %{_sbindir}/alternatives --remove-all $f.1.gz >& /dev/null || :
+      $f.1.gz %{_mandir}/man1/$f-%{api_ver}.1.gz %{priority} || :
-    done
+done
-fi
+
+%preun
+for f in %{vala_binaries};
+do
+    %{_sbindir}/alternatives --remove $f \
+      %{_bindir}/$f-%{api_ver} || :
+done
+for f in %{vala_manpages};
+do
+    %{_sbindir}/alternatives --remove $f.1.gz \
+      %{_mandir}/man1/$f-%{api_ver}.1.gz || :
+done
 
 
 %files
 %license COPYING
-%{_bindir}/vala
+%ghost %{_bindir}/vala
+%ghost %{_bindir}/valac
+%ghost %{_bindir}/vala-gen-introspect
+%ghost %{_bindir}/vapigen
 %{_bindir}/vala-%{api_ver}
-%{_bindir}/valac
 %{_bindir}/valac-%{api_ver}
-%{_bindir}/vala-gen-introspect
 %{_bindir}/vala-gen-introspect-%{api_ver}*
-%{_bindir}/vapigen
 %{_bindir}/vapigen-%{api_ver}
 %{_libdir}/pkgconfig/vapigen*.pc
 %{_libdir}/vala-%{api_ver}/
+%{_libdir}/libvala-%{api_ver}.so.*
 %{_datadir}/aclocal/vala.m4
 %{_datadir}/aclocal/vapigen.m4
 %{_datadir}/vala/
 %{_datadir}/vala-%{api_ver}/
-%{_mandir}/man1/valac.1*
+%ghost %{_mandir}/man1/valac.1.gz
-%{_mandir}/man1/valac-%{api_ver}.1*
+%ghost %{_mandir}/man1/vala-gen-introspect.1.gz
-%{_mandir}/man1/vala-gen-introspect.1*
+%ghost %{_mandir}/man1/vapigen.1.gz
-%{_mandir}/man1/vala-gen-introspect-%{api_ver}.1*
+%{_mandir}/man1/valac-%{api_ver}.1.gz
-%{_mandir}/man1/vapigen.1*
+%{_mandir}/man1/vala-gen-introspect-%{api_ver}.1.gz
-%{_mandir}/man1/vapigen-%{api_ver}.1*
+%{_mandir}/man1/vapigen-%{api_ver}.1.gz
 
-%files -n libvala
+%files devel
-%license COPYING
-%{_libdir}/libvala-%{api_ver}.so.*
-
-%files -n libvala-devel
 %{_includedir}/vala-%{api_ver}
 %{_libdir}/libvala-%{api_ver}.so
 %{_libdir}/pkgconfig/libvala-%{api_ver}.pc
@@ -207,8 +208,8 @@ fi
 %{_bindir}/valadoc
 %{_bindir}/valadoc-%{api_ver}
 %{_libdir}/libvaladoc-%{api_ver}.so.0*
-%{_libdir}/valadoc-%{api_ver}/
+%{_libdir}/valadoc/
-%{_datadir}/valadoc-%{api_ver}/
+%{_datadir}/valadoc/
 %{_mandir}/man1/valadoc-%{api_ver}.1*
 %{_mandir}/man1/valadoc.1*
 
@@ -219,194 +220,28 @@ fi
 
 
 %changelog
-* Sun Aug 22 2021 Kalev Lember <klember@redhat.com> - 0.48.19-1
+* Fri Jan 15 2021 Kalev Lember <klember@redhat.com> - 0.40.19-2
-- Update to 0.48.19
-
-* 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
-
-* Fri May 07 2021 Kalev Lember <klember@redhat.com> - 0.48.17-1
-- Update to 0.48.17
-
-* 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
-
-* Sun Feb 28 2021 Kalev Lember <klember@redhat.com> - 0.48.14-1
-- Update to 0.48.14
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.48.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Jan 16 2021 Kalev Lember <klember@redhat.com> - 0.48.13-1
-- Update to 0.48.13
-
-* Fri Jan 15 2021 Kalev Lember <klember@redhat.com> - 0.48.12-2
 - Fix multilib conflicts in vala-gen-introspect
+- Resolves: #1853170
 
-* Thu Nov 19 2020 Kalev Lember <klember@redhat.com> - 0.48.12-1
+* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 0.40.19-1
-- Update to 0.48.12
+- Update to 0.40.19
+- Resolves: #1753520
 
-* Tue Sep 29 2020 Kalev Lember <klember@redhat.com> - 0.48.11-1
+* Tue Nov 19 2019 Kalev Lember <klember@redhat.com> - 0.40.18-1
-- Update to 0.48.11
+- Update to 0.40.18
+- Resolves: #1753520
 
-* Sun Sep 06 2020 Kalev Lember <klember@redhat.com> - 0.48.10-1
+* Mon Nov 18 2019 Kalev Lember <klember@redhat.com> - 0.40.17-1
-- Update to 0.48.10
+- Update to 0.40.17
+- Resolves: #1753520
 
-* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 0.48.9-1
+* Tue Oct 16 2018 Kalev Lember <klember@redhat.com> - 0.40.10-1
-- Update to 0.48.9
+- Update to 0.40.10
-
-* Wed Jul 29 2020 Kalev Lember <klember@redhat.com> - 0.48.8-1
-- Update to 0.48.8
-
-* Mon Jul 20 2020 Kalev Lember <klember@redhat.com> - 0.48.7-1
-- Update to 0.48.7
-
-* Mon May 18 2020 Kalev Lember <klember@redhat.com> - 0.48.6-1
-- Update to 0.48.6
-
-* Thu Apr 23 2020 Kalev Lember <klember@redhat.com> - 0.48.5-1
-- Update to 0.48.5
-
-* Wed Apr 22 2020 Kalev Lember <klember@redhat.com> - 0.48.4-1
-- Update to 0.48.4
-
-* Mon Apr 06 2020 Kalev Lember <klember@redhat.com> - 0.48.3-1
-- Update to 0.48.3
-
-* Tue Mar 24 2020 Kalev Lember <klember@redhat.com> - 0.48.2-1
-- Update to 0.48.2
-
-* Wed Mar 11 2020 Kalev Lember <klember@redhat.com> - 0.48.1-1
-- Update to 0.48.1
-
-* Wed Mar 04 2020 Kalev Lember <klember@redhat.com> - 0.48.0-1
-- Update to 0.48.0
-
-* Mon Feb 24 2020 Kalev Lember <klember@redhat.com> - 0.47.92-1
-- Update to 0.47.92
-
-* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 0.47.91-1
-- Update to 0.47.91
-
-* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 0.47.4-1
-- Update to 0.47.4
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.47.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 24 2020 Kalev Lember <klember@redhat.com> - 0.47.3-1
-- Update to 0.47.3
-
-* Mon Nov 18 2019 Kalev Lember <klember@redhat.com> - 0.46.5-1
-- Update to 0.46.5
-
-* Mon Nov 11 2019 Kalev Lember <klember@redhat.com> - 0.46.4-1
-- Update to 0.46.4
-
-* Wed Oct 09 2019 Kalev Lember <klember@redhat.com> - 0.46.3-1
-- Update to 0.46.3
-
-* Mon Sep 30 2019 Kalev Lember <klember@redhat.com> - 0.46.2-1
-- Update to 0.46.2
-
-* Mon Sep 16 2019 Kalev Lember <klember@redhat.com> - 0.46.1-1
-- Update to 0.46.1
-
-* Thu Sep 05 2019 Kalev Lember <klember@redhat.com> - 0.46.0-1
-- Update to 0.46.0
-
-* Mon Aug 19 2019 Kalev Lember <klember@redhat.com> - 0.45.91-1
-- Update to 0.45.91
-
-* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 0.45.90-1
-- Update to 0.45.90
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.45.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 18 2019 Kalev Lember <klember@redhat.com> - 0.45.3-1
-- Update to 0.45.3
-
-* Tue Jul 16 2019 Kalev Lember <klember@redhat.com> - 0.44.6-1
-- Update to 0.44.6
-
-* Mon Jun 17 2019 Kalev Lember <klember@redhat.com> - 0.44.5-1
-- Update to 0.44.5
-
-* Wed Jun 05 2019 Kalev Lember <klember@redhat.com> - 0.44.4-1
-- Update to 0.44.4
-
-* Mon Apr 08 2019 Kalev Lember <klember@redhat.com> - 0.44.3-1
-- Update to 0.44.3
-
-* Sun Mar 31 2019 Kalev Lember <klember@redhat.com> - 0.44.2-1
-- Update to 0.44.2
-
-* Mon Mar 18 2019 Kalev Lember <klember@redhat.com> - 0.44.1-1
-- Update to 0.44.1
-
-* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 0.44.0-1
-- Update to 0.44.0
-
-* Sun Mar 03 2019 Kalev Lember <klember@redhat.com> - 0.43.92-1
-- Update to 0.43.92
-
-* Thu Feb 21 2019 Kalev Lember <klember@redhat.com> - 0.43.91-1
-- Update to 0.43.91
-
-* Tue Feb 12 2019 Kalev Lember <klember@redhat.com> - 0.43.90-2
-- Drop the alternatives system
-
-* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 0.43.90-1
-- Update to 0.43.90
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.43.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 29 2019 Pete Walter <pwalter@fedoraproject.org> - 0.43.6-2
-- Bump vala-devel obsoletes version
-
-* Tue Jan 22 2019 Kalev Lember <klember@redhat.com> - 0.43.6-1
-- Update to 0.43.6
-
-* Mon Jan 07 2019 Kalev Lember <klember@redhat.com> - 0.43.4-1
-- Update to 0.43.4
-
-* Thu Dec 27 2018 Kalev Lember <klember@redhat.com> - 0.42.4-1
-- Update to 0.42.4
-
-* Mon Nov 12 2018 Kalev Lember <klember@redhat.com> - 0.42.3-2
-- Split out libvala subpackage with the shared library (#1499590)
-- Rename vala-devel to libvala-devel to match with the libvala package
-
-* Wed Nov 07 2018 Kalev Lember <klember@redhat.com> - 0.42.3-1
-- Update to 0.42.3
-
-* Mon Sep 24 2018 Kalev Lember <klember@redhat.com> - 0.42.2-1
-- Update to 0.42.2
-
-* Mon Sep 17 2018 Kalev Lember <klember@redhat.com> - 0.42.1-1
-- Update to 0.42.1
-
-* Wed Sep 05 2018 Kalev Lember <klember@redhat.com> - 0.42.0-1
-- Update to 0.42.0
-
-* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 0.41.91-1
-- Update to 0.41.91
-
-* Mon Aug 06 2018 Kalev Lember <klember@redhat.com> - 0.41.90-1
-- Update to 0.41.90
 
 * Wed Jul 25 2018 Kalev Lember <klember@redhat.com> - 0.40.8-1
 - Update to 0.40.8
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Tue Jun 26 2018 Kalev Lember <klember@redhat.com> - 0.40.7-1
 - Update to 0.40.7