Trying to fix 1124402

epel8
alexjnewt@hotmail.com 10 years ago
parent 20dbdc103d
commit c239e24578

@ -11,7 +11,7 @@
Name: %{wxgtkname}
Version: 3.0.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
@ -73,7 +73,6 @@ ranging from networking to HTML display and image manipulation.
Summary: OpenGL add-on for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Conflicts: wxGTK-devel
%description gl
OpenGL (a 3D graphics API) add-on for the wxWidgets library.
@ -123,8 +122,7 @@ This package provides documentation for the %{srcname} library.
%setup -q -n %{srcname}-%{version} -a 1
# patch some installed files to avoid conflicts with 2.8.*
#The following line is disabled to avoid bugs:
#sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
sed -i -e 's|wxstd.mo|wxstd3.mo|' Makefile.in
sed -i -e 's|wxmsw.mo|wxmsw3.mo|' Makefile.in
@ -163,21 +161,21 @@ make %{?_smp_mflags}
# install our multilib-aware wrapper
##Remove installed
rm %{buildroot}%{_bindir}/wx-config
##Install new
#install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config
install -p -D -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config
##Install new and symlink
install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config
ln -s ../..%{_libexecdir}/%{name}/wx-config %{buildroot}%{_bindir}/wx-config-3.0
##If gtk2
%if %{gtkver} == 2
#sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config
sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_bindir}/wx-config
sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config
%endif
#Move wxrc to libexec (avoid conflict with wxGTK)
#mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_libexecdir}/%{name}/wxrc
#Move wxrc to libexec and symlink (avoid conflict with wxGTK)
mv %{buildroot}%{_bindir}/wxrc* %{buildroot}%{_libexecdir}/%{name}
ln -s ../..%{_libexecdir}/%{name}/wxrc-3.0 %{buildroot}%{_bindir}/wxrc-3.0
# move bakefiles to avoid conflicts with 2.8.*
#mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3
#mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx3
mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3
mv %{buildroot}%{_datadir}/bakefile/presets/*.* %{buildroot}%{_datadir}/bakefile/presets/wx3
%find_lang wxstd3
%find_lang wxmsw3
@ -219,13 +217,13 @@ popd
%files devel
%{_bindir}/wxrc-3.0
%{_bindir}/wx-config
%{_bindir}/wxrc
%{_bindir}/wx-config-3.0
%{_includedir}/wx-3.0
%{_libdir}/libwx_*.so
%{_libdir}/wx
%{_datadir}/aclocal/wxwin.m4
%{_datadir}/bakefile/presets/*.*
%{_datadir}/aclocal/wxwin3.m4
%{_datadir}/bakefile/presets/wx3/*.*
%{_libexecdir}/%{name}
%files gl
%{_libdir}/libwx_gtk%{gtkver}u_gl-*.so.*
@ -244,6 +242,10 @@ popd
%doc html
%changelog
* Tue Nov 04 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.2-2
- Moving things around again, hopefully fixing RH#1124402
- Adding symlinks to avoid breaking things
* Tue Nov 04 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.2-1
- Update to 3.0.2

Loading…
Cancel
Save