From 992ca3af33b18d6638a98eca3d0b75fe43a39ee5 Mon Sep 17 00:00:00 2001 From: "alexjnewt@hotmail.com" Date: Thu, 3 Apr 2014 22:16:56 -0400 Subject: [PATCH] Temp fix for devel... still working out a good solution --- wxGTK3.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wxGTK3.spec b/wxGTK3.spec index 316c077..ae463cd 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -11,7 +11,7 @@ Name: %{wxgtkname} Version: 3.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -62,6 +62,7 @@ Requires: %{name}-media = %{version}-%{release} Requires: %{wxbasename} = %{version}-%{release} Requires: gtk%{gtkver}-devel Requires: libGLU-devel +Conflicts: wxGTK-devel Provides: %{srcname}-devel = %{version}-%{release} %description devel @@ -171,6 +172,7 @@ make %{?_smp_mflags} rm %{buildroot}%{_bindir}/wx-config rm %{buildroot}%{_bindir}/wxrc install -p -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config-3.0 +ln -s %{buildroot}%{_bindir}/wx-config-3.0 %{buildroot}%{_bindir}/wx-config # move bakefiles to avoid conflicts with 2.8.* mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3 @@ -240,6 +242,10 @@ popd %doc html %changelog +* Thu Apr 3 2014 Jeremy Newton - 3.0.0-7 +- Removed wxGTK-devel compatiblity in favour for a wx-config symlink + see bug RH#1077718 + * Tue Mar 18 2014 Jeremy Newton - 3.0.0-6 - Removed disable-catch_segvs, see RH#1076617