From d2d9b90405248216ceb7a1966f4d872e16e1bde9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Feb 08 2019 20:29:57 +0000 Subject: Remove the alternatives system for wx-config and wxrc wxGTK is retired in F30+ and we can now drop the alternatives. --- diff --git a/wxGTK3.spec b/wxGTK3.spec index 0650bf2..c1e91fb 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -18,7 +18,7 @@ Name: %{wxgtkname} Version: 3.0.4 -Release: 6%{?snapshottag}%{?dist} +Release: 7%{?snapshottag}%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets URL: https://www.wxwidgets.org/ @@ -87,8 +87,7 @@ ranging from networking to HTML display and image manipulation. %package -n %{wxbasename}-devel Summary: Development files for the wxBase3 library Requires: %{wxbasename}%{?_isa} = %{version}-%{release} -Requires(post): /usr/sbin/update-alternatives -Requires(postun): /usr/sbin/update-alternatives +Requires(pre): /usr/sbin/update-alternatives %description -n %{wxbasename}-devel This package include files needed to link with the wxBase3 library. @@ -325,15 +324,9 @@ popd ##Remove installed rm %{buildroot}%{_bindir}/wx-config ##Install new and symlink -install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config -sed -i -e 's|=/usr|=%{_prefix}|' %{buildroot}%{_libexecdir}/%{name}/wx-config -ln -s ../..%{_libexecdir}/%{name}/wx-config %{buildroot}%{_bindir}/wx-config-3.0 -touch %{buildroot}%{_bindir}/wx-config - -#Alternatives setup with wxrc -mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/%{name} -ln -s ../..%{_libexecdir}/%{name}/wxrc-3.0 %{buildroot}%{_bindir}/wxrc-3.0 -touch %{buildroot}%{_bindir}/wxrc +install -p -D -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config-3.0 +sed -i -e 's|=/usr|=%{_prefix}|' %{buildroot}%{_bindir}/wx-config-3.0 +ln -s wx-config-3.0 %{buildroot}%{_bindir}/wx-config # move bakefiles to avoid conflicts with 2.8.* mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3 @@ -354,19 +347,12 @@ make %{?_smp_mflags} LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./test popd -%post -n %{wxbasename}-devel -if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then - rm %{_bindir}/wx-config -fi -/usr/sbin/update-alternatives --install %{_bindir}/wx-config \ - wx-config %{_libexecdir}/%{name}/wx-config 3 -/usr/sbin/update-alternatives --install %{_bindir}/wxrc \ - wxrc %{_libexecdir}/%{name}/wxrc 3 - -%postun -n %{wxbasename}-devel -if [ $1 -eq 0 ] ; then - /usr/sbin/update-alternatives --remove wx-config %{_libexecdir}/%{name}/wx-config - /usr/sbin/update-alternatives --remove wxrc %{_libexecdir}/%{name}/wxrc +# Drop the pre script in F32 +%pre -n %{wxbasename}-devel +if [ $1 -gt 1 ] ; then + # Remove obsolete wx-config and wxrc alternatives + /usr/sbin/update-alternatives --remove wx-config %{_libexecdir}/%{name}/wx-config >& /dev/null ||: + /usr/sbin/update-alternatives --remove wxrc %{_libexecdir}/%{name}/wxrc >& /dev/null ||: fi %files @@ -398,10 +384,10 @@ fi %{_libdir}/libwx_gtk2u_xrc-*.so.* %files -n %{wxbasename}-devel -%ghost %{_bindir}/wx-config -%ghost %{_bindir}/wxrc -%{_bindir}/wxrc-3.0 +%{_bindir}/wx-config %{_bindir}/wx-config-3.0 +%{_bindir}/wxrc +%{_bindir}/wxrc-3.0 %{_includedir}/wx-3.0 %{_libdir}/libwx_baseu*.so %dir %{_libdir}/wx @@ -412,7 +398,6 @@ fi #Exclude some python bitecode %exclude %{_datadir}/bakefile/presets/wx3/*.pyc %exclude %{_datadir}/bakefile/presets/wx3/*.pyo -%{_libexecdir}/%{name} %files devel %{_libdir}/libwx_gtk3u_*.so @@ -454,6 +439,9 @@ fi %doc html %changelog +* Fri Feb 08 2019 Kalev Lember - 3.0.4-7 +- Remove the alternatives system for wx-config and wxrc + * Sun Feb 03 2019 Fedora Release Engineering - 3.0.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild