rename /usr/share/aclocal/wxwin.m4 to avoid a conflict with 3.0 [release 2.8.12-6mamba;Fri Aug 22 2014]

wxGTK.spec

@@ -9,7 +9,7 @@
 
 Name:          %{wxMain}
 Version:       2.8.12
-Release:       5mamba
+Release:       6mamba
 Summary:       GTK+ port of the wxWidgets library
 Group:         System/Libraries
 Vendor:        openmamba
@@ -319,15 +319,15 @@ ln -sf %{_libdir}/wx/config/gtk2-ansi-release-%{majversion} \
 install -d %{buildroot}%{_datadir}/wx/examples/src
 cp -a demos samples %{buildroot}%{_datadir}/wx/examples
 
-# FIXME: wxwin.m4 generate a conflict between wx 2.6 and 2.8
-#mv %{buildroot}%{_datadir}/aclocal/wxwin.m4 \
-#   %{buildroot}%{_datadir}/aclocal/wxwin%{majversion}.m4
-
 # unicode version
 cd wxGTK-%{version}
 %makeinstall
 %makeinstall -C contrib/src
 
+# NOTE: wxwin.m4 generates a conflict between wx 2.8 and 3.0
+mv %{buildroot}%{_datadir}/aclocal/wxwin.m4 \
+   %{buildroot}%{_datadir}/aclocal/wxwin%{majversion}.m4
+
 mv %{buildroot}%{_bindir}/wxrc-%{majversion} \
    %{buildroot}%{_bindir}/wxrc-%{majversion}-unicode
 
@@ -430,8 +430,7 @@ fi
 %defattr(-,root,root)
 %{_libdir}/wx/%{majversion}/sound_sdl-%{majversion}.so
 %{_includedir}/wx-%{majversion}/
-# note: these files generate conflicts between wx 2.6 and 2.8
-%{_datadir}/aclocal/wxwin.m4
+%{_datadir}/aclocal/wxwin%{majversion}.m4
 %{_datadir}/bakefile/
 
 %files -n %{wxGTK_name}
@@ -458,6 +457,9 @@ fi
 %{_datadir}/wx/examples
 
 %changelog
+* Fri Aug 22 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-6mamba
+- rename /usr/share/aclocal/wxwin.m4 to avoid a conflict with 3.0
+
 * Mon Mar 24 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.12-5mamba
 - also remove conflicting wxmsw.mo (don't know how to rename but should be useful on windows only)