Remove the alternatives system for wx-config and wxrc

wxGTK is retired in F30+ and we can now drop the alternatives.
epel8
Kalev Lember 6 years ago
parent 7cee207065
commit d2d9b90405

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

Loading…
Cancel
Save