pool/vala
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1208157 from GNOME:Factory

Browse Source 
- Eliminate usageof update-alternatives: the added complexity was
  not used a single time in the 14 years we had it.

I'm sure nobody is going to miss that :) (forwarded request 1208100 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1208157
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vala?expand=0&rev=143
This commit is contained in:
Ana Guerrero 2024-10-16 21:37:26 +00:00 committed by Git OBS Bridge
commit 5a7c4fe97d
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vala.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 15 11:03:54 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Eliminate usageof update-alternatives: the added complexity was
not used a single time in the 14 years we had it.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 19 13:04:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Fri Apr 19 13:04:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

38
vala.spec
View File

@ -43,8 +43,6 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
%if %{with graphviz} %if %{with graphviz}
BuildRequires: pkgconfig(libgvc) >= 2.16 BuildRequires: pkgconfig(libgvc) >= 2.16
%endif %endif
Requires(post): update-alternatives
Requires(postun): update-alternatives
# Vala is a compiler, so it's also a devel package # Vala is a compiler, so it's also a devel package
Provides: vala-devel = %{version} Provides: vala-devel = %{version}
Obsoletes: vala-devel < %{version} Obsoletes: vala-devel < %{version}
@ -141,36 +139,8 @@ This package contains the libvaladoc development files.
%install %install
%make_install %make_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# Setup update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s -f %{_sysconfdir}/alternatives/vala %{buildroot}%{_bindir}/vala
ln -s -f %{_sysconfdir}/alternatives/valac %{buildroot}%{_bindir}/valac
ln -s -f %{_sysconfdir}/alternatives/vala-gen-introspect %{buildroot}%{_bindir}/vala-gen-introspect
ln -s -f %{_sysconfdir}/alternatives/vapigen %{buildroot}%{_bindir}/vapigen
ln -s -f %{_sysconfdir}/alternatives/valac.1%{?ext_man} %{buildroot}%{_mandir}/man1/valac.1%{?ext_man}
ln -s -f %{_sysconfdir}/alternatives/vala-gen-introspect.1%{?ext_man} %{buildroot}%{_mandir}/man1/vala-gen-introspect.1%{?ext_man}
ln -s -f %{_sysconfdir}/alternatives/vapigen.1%{?ext_man}%{buildroot}%{_mandir}/man1/vapigen.1%{?ext_man}
ln -s -f %{_sysconfdir}/alternatives/vapigen.pc %{buildroot}%{_libdir}/pkgconfig/vapigen.pc
%fdupes %{buildroot}%{_datadir} %fdupes %{buildroot}%{_datadir}
%post
update-alternatives \
--install %{_bindir}/vala vala %{_bindir}/vala-%{vala_version} \
%{vala_priority} \
--slave %{_bindir}/valac valac %{_bindir}/valac-%{vala_version} \
--slave %{_bindir}/vala-gen-introspect vala-gen-introspect %{_bindir}/vala-gen-introspect-%{vala_version} \
--slave %{_bindir}/vapigen vapigen %{_bindir}/vapigen-%{vala_version} \
--slave %{_mandir}/man1/valac.1%{?ext_man} valac.1%{?ext_man} %{_mandir}/man1/valac-%{vala_version}.1%{?ext_man} \
--slave %{_mandir}/man1/vala-gen-introspect.1%{?ext_man} vala-gen-introspect.1%{?ext_man} %{_mandir}/man1/vala-gen-introspect-%{vala_version}.1%{?ext_man} \
--slave %{_mandir}/man1/vapigen.1%{?ext_man} vapigen.1%{?ext_man} %{_mandir}/man1/vapigen-%{vala_version}.1%{?ext_man} \
--slave %{_libdir}/pkgconfig/vapigen.pc vapigen.pc %{_libdir}/pkgconfig/vapigen-%{vala_version}.pc
%postun
# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed
if [ ! -f %{_bindir}/vala-%{vala_version} ]; then
update-alternatives --remove vala %{_bindir}/vala-%{vala_version}
fi
%ldconfig_scriptlets -n libvala-%{vala_libversion}-0 %ldconfig_scriptlets -n libvala-%{vala_libversion}-0
%if %{with graphviz} %if %{with graphviz}
%ldconfig_scriptlets -n libvaladoc-%{vala_libversion}-0 %ldconfig_scriptlets -n libvaladoc-%{vala_libversion}-0
@ -187,14 +157,6 @@ fi
%{_mandir}/man1/vala-gen-introspect.1%{?ext_man} %{_mandir}/man1/vala-gen-introspect.1%{?ext_man}
%{_mandir}/man1/vapigen.1%{?ext_man} %{_mandir}/man1/vapigen.1%{?ext_man}
%{_libdir}/pkgconfig/vapigen.pc %{_libdir}/pkgconfig/vapigen.pc
%ghost %attr(755,root,root) %{_sysconfdir}/alternatives/vala
%ghost %attr(755,root,root) %{_sysconfdir}/alternatives/valac
%ghost %attr(755,root,root) %{_sysconfdir}/alternatives/vala-gen-introspect
%ghost %attr(755,root,root) %{_sysconfdir}/alternatives/vapigen
%ghost %attr(644,root,root) %{_sysconfdir}/alternatives/valac.1%{?ext_man}
%ghost %attr(644,root,root) %{_sysconfdir}/alternatives/vala-gen-introspect.1%{?ext_man}
%ghost %attr(644,root,root) %{_sysconfdir}/alternatives/vapigen.1%{?ext_man}
%ghost %attr(644,root,root) %{_sysconfdir}/alternatives/vapigen.pc
%{_bindir}/vala-%{vala_version} %{_bindir}/vala-%{vala_version}
%{_bindir}/valac-%{vala_version} %{_bindir}/valac-%{vala_version}
%{_bindir}/vala-gen-introspect-%{vala_version} %{_bindir}/vala-gen-introspect-%{vala_version}