rpms/compat-wxGTK26/devel wxGTK-2.6.4-config-script.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 compat-wxGTK26.spec, 1.11, 1.12 sources, 1.2, 1.3 wxGTK-2.6.3-config-script.patch, 1.1, NONE wxGTK-2.6.3.2-cvs.patch, 1.1, NONE

Thu Nov 8 12:13:18 UTC 2007

Author: mschwendt

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

Modified Files:
	.cvsignore compat-wxGTK26.spec sources 
Added Files:
	wxGTK-2.6.4-config-script.patch 
Removed Files:
	wxGTK-2.6.3-config-script.patch wxGTK-2.6.3.2-cvs.patch 
Log Message:
* Wed Nov 07 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.4-1
- Update to 2.6.4.


wxGTK-2.6.4-config-script.patch:

--- NEW FILE wxGTK-2.6.4-config-script.patch ---
diff -Nur wxGTK-2.6.4-orig/wx-config.in wxGTK-2.6.4/wx-config.in
--- wxGTK-2.6.4-orig/wx-config.in	2007-03-20 16:49:55.000000000 +0100
+++ wxGTK-2.6.4/wx-config.in	2007-11-08 12:57:33.000000000 +0100
@@ -334,11 +334,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.
@@ -856,7 +856,7 @@
 exec_prefix=${this_exec_prefix-$exec_prefix}
 
 includedir="@includedir@"
-libdir="@libdir@"
+libdir="/usr/lib"
 bindir="@bindir@"
 
 # Trivial queries we can answer now.
@@ -1129,7 +1129,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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Feb 2007 14:34:31 -0000	1.2
+++ .cvsignore	8 Nov 2007 12:12:45 -0000	1.3
@@ -1 +1 @@
-wxGTK-2.6.3.tar.bz2
+wxGTK-2.6.4.tar.bz2


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compat-wxGTK26.spec	21 Oct 2007 18:09:36 -0000	1.11
+++ compat-wxGTK26.spec	8 Nov 2007 12:12:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
-Version:        2.6.3
-Release:        9
+Version:        2.6.4
+Release:        1
 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
@@ -9,14 +9,13 @@
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
-Patch0:         wxGTK-2.6.3.2-cvs.patch
 Patch1:         wxGTK-2.6.3-locale-compat.patch
 Patch2:         wxGTK-2.6.3-gtk-crash.patch
 Patch3:         wxGTK-2.6.3-g_thread_init.patch
 #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
+Patch7:         wxGTK-2.6.4-config-script.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -50,7 +49,6 @@
 %prep
 %setup -q -n wxGTK-%{version}
 
-%patch0 -p1 -b .2.6.3.2
 %patch1 -p1 -b .locale-compat
 %patch2 -p1 -b .gtk-crash
 %patch3 -p1 -b .g_thread_init
@@ -169,6 +167,9 @@
 
 
 %changelog
+* Wed Nov 07 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.4-1
+- Update to 2.6.4.
+
 * 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).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Feb 2007 14:34:31 -0000	1.2
+++ sources	8 Nov 2007 12:12:45 -0000	1.3
@@ -1 +1 @@
-3cd76c3c47913e52a3175dd47239c6ec  wxGTK-2.6.3.tar.bz2
+ce0fd2b425bc98957cf70eea5f154b49  wxGTK-2.6.4.tar.bz2


--- wxGTK-2.6.3-config-script.patch DELETED ---


--- wxGTK-2.6.3.2-cvs.patch DELETED ---


