rpms/wxMaxima/F-11 wxMaxima-0.7.6-ltr_layout.patch, NONE, 1.1 wxMaxima.spec, 1.26, 1.27

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32679

Modified Files:
	wxMaxima.spec 
Added Files:
	wxMaxima-0.7.6-ltr_layout.patch 
Log Message:
* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
- output window of wxMaxima is not visible in RtL locales (#455863)
- optimize scriptlets


wxMaxima-0.7.6-ltr_layout.patch:
 MathCtrl.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE wxMaxima-0.7.6-ltr_layout.patch ---
diff -up wxMaxima-0.7.6/src/MathCtrl.cpp.ltr_layout wxMaxima-0.7.6/src/MathCtrl.cpp
--- wxMaxima-0.7.6/src/MathCtrl.cpp.ltr_layout	2008-08-20 05:41:10.000000000 -0500
+++ wxMaxima-0.7.6/src/MathCtrl.cpp	2009-07-18 15:52:00.705906685 -0500
@@ -65,6 +65,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_timer.SetOwner(this, TIMER_ID);
   m_caretTimer.SetOwner(this, CARET_TIMER_ID);
   AdjustSize(false);
+  // hack to workaround problems in RtL locales, http://bugzilla.redhat.com/455863
+  SetLayoutDirection(wxLayout_LeftToRight);
 }
 
 MathCtrl::~MathCtrl() {


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/wxMaxima.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- wxMaxima.spec	27 Feb 2009 20:44:49 -0000	1.26
+++ wxMaxima.spec	18 Jul 2009 21:48:41 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,6 +12,8 @@ URL:     http://wxmaxima.sourceforge.net
 Source0: http://downloads.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.7.6-ltr_layout.patch
+
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
 # reinclude ppc when fixed: http://bugzilla.redhat.com/448734
@@ -37,6 +39,8 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
+%patch1 -p1 -b .ltr_layout
+
 ## wxmaxima.desktop fixups
 # do (some) Categories munging here, some versions of desktop-file-install 
 # (*cough rhel4*) truncate Categories if --remove-category'd items is a
@@ -47,9 +51,6 @@ sed -i \
   -e "s|^Terminal=0|Terminal=false|" \
   wxmaxima.desktop
 
-# app icon
-convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
-
 
 %build
 %configure \
@@ -73,6 +74,7 @@ desktop-file-install --vendor="" \
 
 # app icon
 install -p -D -m644 wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
 install -p -D -m644 wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
 
 # Unpackaged files
@@ -80,18 +82,27 @@ rm -f %{buildroot}%{_datadir}/wxMaxima/{
 
 %find_lang wxMaxima 
 
+# Unpackaged files
+rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f wxMaxima.lang
@@ -106,6 +117,10 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
+- output window of wxMaxima is not visible in RtL locales (#455863)
+- optimize scriptlets
+
 * Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3 
 - ExclusiveArch: s/i386/%%ix86/