rpms/compat-wxGTK/FC-5 wxGTK-2.4.2-locale-compat.patch, NONE, 1.1 compat-wxGTK.spec, 1.5, 1.6
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Aug 22 22:15:12 UTC 2006
Author: mschwendt
Update of /cvs/extras/rpms/compat-wxGTK/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26145/FC-5
Modified Files:
compat-wxGTK.spec
Added Files:
wxGTK-2.4.2-locale-compat.patch
Log Message:
Here's the fix.
wxGTK-2.4.2-locale-compat.patch:
--- NEW FILE wxGTK-2.4.2-locale-compat.patch ---
diff -Nur wxGTK-2.4.2-orig/src/common/intl.cpp wxGTK-2.4.2/src/common/intl.cpp
--- wxGTK-2.4.2-orig/src/common/intl.cpp 2003-09-21 13:31:39.000000000 +0200
+++ wxGTK-2.4.2/src/common/intl.cpp 2006-08-22 22:48:14.000000000 +0200
@@ -637,7 +637,7 @@
m_pMsgCat = NULL;
bool bOk = TRUE;
if ( bLoadDefault )
- bOk = AddCatalog(wxT("wxstd"));
+ bOk = AddCatalog(wxT("compat-wxstd"));
return bOk;
}
Index: compat-wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/FC-5/compat-wxGTK.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compat-wxGTK.spec 22 Aug 2006 20:15:31 -0000 1.5
+++ compat-wxGTK.spec 22 Aug 2006 22:15:12 -0000 1.6
@@ -2,7 +2,7 @@
Name: compat-wxGTK
Version: 2.4.2
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Compatibility version of the wxWidgets GTK GUI library
License: BSD
Group: System Environment/Libraries
@@ -11,6 +11,7 @@
Patch0: wxGTK-2.4.2-privates.patch
Patch1: wxGTK-2.4.2-aclocal18.patch
Patch2: wxGTK-2.4.2-gcc4.patch
+Patch3: wxGTK-2.4.2-locale-compat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel gtk2-devel zlib-devel >= 1.1.4
@@ -149,6 +150,7 @@
%patch0 -p1 -b .privates
%patch1 -p0 -b .aclocal18
%patch2 -p1 -b .gcc4
+%patch3 -p1 -b .locale-compat
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@@ -217,8 +219,7 @@
mv $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin.m4 \
$RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin-2.4.m4
-# We have to rename the .mo files. This will probably break the
-# translations, but anyone so motivated to use them can rename them back.
+# We have to rename the .mo files.
for i in $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/wxstd.mo; do
NEWNAME=`echo $i | sed -e "s/wxstd.mo/compat-wxstd.mo/"`;
mv $i $NEWNAME;
@@ -324,6 +325,9 @@
%changelog
+* Wed Aug 23 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-20
+- add patch to make the code find the renamed .mo files
+
* Tue Aug 22 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-19
- freetype2 fix is only needed for FC-6+
More information about the scm-commits
mailing list