rpms/compat-wxGTK26/devel wxGTK-2.6.3-config-script.patch, NONE, 1.1 compat-wxGTK26.spec, 1.9, 1.10

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12506

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-config-script.patch 
Log Message:
* Sun Oct 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-9
- Patch the wx-2.6-config script and move the common files to /usr/lib.
  This shall fix the multiarch conflict in compat-wxGTK26-devel (#340931).


wxGTK-2.6.3-config-script.patch:

--- NEW FILE wxGTK-2.6.3-config-script.patch ---
diff -Nur wxGTK-2.6.3-orig/wx-config.in wxGTK-2.6.3/wx-config.in
--- wxGTK-2.6.3-orig/wx-config.in	2006-03-22 00:42:05.000000000 +0100
+++ wxGTK-2.6.3/wx-config.in	2007-10-21 17:28:26.000000000 +0200
@@ -352,11 +352,11 @@
 # Determine the base directories we require.
 prefix=${input_option_prefix-${this_prefix:- at prefix@}}
 exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:- at exec_prefix@}}}
-wxconfdir="@libdir@/wx/config"
+wxconfdir="/usr/lib/wx/config"
 
 installed_configs=$( cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-" )
 
-is_cross && target="@host_alias@"
+is_cross && true
 
 # Define a pseudo-hash to contain the specification of this wx-config
 # instance and its associated library.
@@ -870,7 +870,7 @@
 exec_prefix=${this_exec_prefix-$exec_prefix}
 
 includedir="@includedir@"
-libdir="@libdir@"
+libdir="/usr/lib"
 bindir="@bindir@"
 
 # Trivial queries we can answer now.
@@ -1143,7 +1143,7 @@
     _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
 fi
 
-_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
+_cppflags=$(echo "-I/usr/lib/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")  
 
 # now without further ado, we can answer these too.
 [ -z "$output_option_cppflags" ] || echo $_cppflags


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat-wxGTK26.spec	14 Sep 2007 11:16:28 -0000	1.9
+++ compat-wxGTK26.spec	21 Oct 2007 17:08:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.3
-Release:        8
+Release:        9
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -16,6 +16,7 @@
 #Patch4:         wxGTK-2.6.3-tooltips.patch
 Patch5:         wxGTK-2.6.3-expat2.patch
 Patch6:         wxGTK-2.6.3-strconv.patch
+Patch7:         wxGTK-2.6.3-config-script.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -56,8 +57,9 @@
 #patch4 -p1 -b .tooltips
 %patch5 -p1 -b .expat2
 %patch6 -p1 -b .strconv
+%patch7 -p1 -b .config-script
 
-sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
+sed -i -e 's|/usr/lib\b|%{_libdir}|' configure
 
 # Avoid executable source files in debuginfo package.
 find . -perm /+x -a \( -name \*.cpp -o -name \*.h \) | xargs chmod -x
@@ -82,6 +84,9 @@
   --enable-unicode \
   --enable-compat22
 
+# Work around sdl-config returning: -L%_libdir
+sed -i -e 's!\(^s, at .*\)-L/usr/lib \(.*-lSDL.*\)!\1 \2!' config.status ; ./config.status
+
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C contrib/src/stc
 make %{?_smp_mflags} -C contrib/src/ogl
@@ -108,6 +113,12 @@
 done
 %find_lang compat-wxstd26
 
+# Move wx/{config/,include/} from %_libdir to /usr/lib.
+if [ "%{_libdir}" != "%{_prefix}/lib" ] ; then
+  mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib
+  mv ${RPM_BUILD_ROOT}%{_libdir}/wx ${RPM_BUILD_ROOT}%{_prefix}/lib
+fi
+
 # Deal with conflicting files.
 cd ${RPM_BUILD_ROOT}%{_bindir}
 rm -f wx-config wxrc
@@ -152,16 +163,16 @@
 %{_bindir}/wxrc*
 %{_includedir}/wx-2.6
 %{_libdir}/libwx_*.so
-%dir %{_libdir}/wx
-%dir %{_libdir}/wx/include
-%{_libdir}/wx/include/gtk2*
-%dir %{_libdir}/wx/config
-%{_libdir}/wx/config/gtk2*
+%{_prefix}/lib/wx/
 %{_datadir}/aclocal/*
 #{_datadir}/bakefile/presets/
 
 
 %changelog
+* Sun Oct 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-9
+- Patch the wx-2.6-config script and move the common files to /usr/lib.
+  This shall fix the multiarch conflict in compat-wxGTK26-devel (#340931).
+
 * Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
 - Patch some dangerous pointer dereferences in src/common/strconv.cpp.