[compat-wxGTK3-gtk2: 14/21] Readd conflict for devel
Lubomir Rintel
lkundrak at fedoraproject.org
Sat Mar 21 10:49:57 UTC 2015
commit 66df003f8186a4a6a214526a610936595981b8cc
Author: alexjnewt at hotmail.com <alexjnewt at hotmail.com>
Date: Mon Oct 27 15:04:19 2014 -0400
Readd conflict for devel
wxGTK3.spec | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/wxGTK3.spec b/wxGTK3.spec
index 2118b2a..7973fd8 100644
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@@ -11,7 +11,7 @@
Name: %{wxgtkname}
Version: 3.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
@@ -75,6 +75,7 @@ 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.
@@ -125,16 +126,17 @@ This package provides documentation for the %{srcname} library.
%patch0 -p1
# patch some installed files to avoid conflicts with 2.8.*
-sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
+#The following line is disabled to avoid bugs:
+#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
# rename docs directory
mv %{srcname}-%{version} html
-sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
# fix plugin dir for 64-bit
+sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
@@ -165,18 +167,20 @@ make %{?_smp_mflags}
##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}%{_libexecdir}/%{name}/wx-config
+install -p -D -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config
##If gtk2
%if %{gtkver} == 2
-sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config
+#sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config
+sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_bindir}/wx-config
%endif
#Move wxrc to libexec (avoid conflict with wxGTK)
-mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_libexecdir}/%{name}/wxrc
+#mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_libexecdir}/%{name}/wxrc
# 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
@@ -218,13 +222,13 @@ popd
%files devel
%{_bindir}/wxrc-3.0
-%{_libexecdir}/%{name}/wx-config
-%{_libexecdir}/%{name}/wxrc
+%{_bindir}/wx-config
+%{_bindir}/wxrc
%{_includedir}/wx-3.0
%{_libdir}/libwx_*.so
%{_libdir}/wx
-%{_datadir}/aclocal/wxwin3.m4
-%{_datadir}/bakefile/presets/wx3/
+%{_datadir}/aclocal/wxwin.m4
+%{_datadir}/bakefile/presets/*.*
%files gl
%{_libdir}/libwx_gtk%{gtkver}u_gl-*.so.*
@@ -243,6 +247,9 @@ popd
%doc html
%changelog
+* Tue Sep 30 2014 Jeremy Newton <alexjnewt at hotmail.com> - 3.0.1-4
+- Add conflict with wxgtk-devel again, temporary fix until it can be resolved
+
* Tue Sep 30 2014 Jeremy Newton <alexjnewt at hotmail.com> - 3.0.1-3
- Avoid gtk warnings, fixes RH#1147995
- Moving wxrc and wx-config to libexec instead of renaming
More information about the scm-commits
mailing list