rpms/wxMaxima/F-11 wxMaxima-0.8.2-ltr_layout.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.9, 1.10 wxMaxima.spec, 1.27, 1.28 wxMaxima-0.7.6-ltr_layout.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore sources wxMaxima.spec 
Added Files:
	wxMaxima-0.8.2-ltr_layout.patch 
Removed Files:
	wxMaxima-0.7.6-ltr_layout.patch 
Log Message:
* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-3
- Requires: maxima >= 5.18


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

--- NEW FILE wxMaxima-0.8.2-ltr_layout.patch ---
diff -up wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout wxMaxima-0.8.2/src/MathCtrl.cpp
--- wxMaxima-0.8.2/src/MathCtrl.cpp.ltr_layout	2009-04-15 07:56:26.000000000 -0500
+++ wxMaxima-0.8.2/src/MathCtrl.cpp	2009-07-18 15:35:58.013133569 -0500
@@ -83,6 +83,8 @@ MathCtrl::MathCtrl(wxWindow* parent, int
   m_saved = true;
   m_evaluationQueue = new EvaluationQueue();
   AdjustSize();
+  // hack to workaround problems in RtL locales, http://bugzilla.redhat.com/455863
+  SetLayoutDirection(wxLayout_LeftToRight);
 }
 
 MathCtrl::~MathCtrl() {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	5 Nov 2008 16:53:32 -0000	1.10
+++ .cvsignore	3 Aug 2009 18:33:05 -0000	1.11
@@ -1 +1 @@
-wxMaxima-0.7.6.tar.gz
+wxMaxima-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Nov 2008 16:53:32 -0000	1.9
+++ sources	3 Aug 2009 18:33:05 -0000	1.10
@@ -1 +1 @@
-01c607778fa6b332144fcbeb902e6ede  wxMaxima-0.7.6.tar.gz
+d3d4abde8495aebb295df587587de4a8  wxMaxima-0.8.2.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-11/wxMaxima.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- wxMaxima.spec	18 Jul 2009 21:48:41 -0000	1.27
+++ wxMaxima.spec	3 Aug 2009 18:33:05 -0000	1.28
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.6
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 3%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -12,7 +12,7 @@ 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
+Patch1: wxMaxima-0.8.2-ltr_layout.patch
 
 # Deployable only where maxima exsists.
 %if 0%{?fedora} > 8
@@ -24,7 +24,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 
 Provides: wxmaxima = %{version}-%{release}
 
-Requires: maxima >= 5.13
+Requires: maxima >= 5.18
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -36,21 +36,12 @@ BuildRequires: sed
 A Graphical user interface for the computer algebra system
 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
-# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
-sed -i \
-  -e "s|^Categories=.*|Categories=Utility;|" \
-  -e "s|^Icon=.*|Icon=wxmaxima|" \
-  -e "s|^Terminal=0|Terminal=false|" \
-  wxmaxima.desktop
-
 
 %build
 %configure \
@@ -73,12 +64,9 @@ desktop-file-install --vendor="" \
   wxmaxima.desktop 
 
 # 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
-rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
+install -p -D -m644 data/wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+convert -resize 48x48 data/wxmaxima.png data/wxmaxima-48x48.png
+install -p -D -m644 data/wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
 
 %find_lang wxMaxima 
 
@@ -113,13 +101,21 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/wxmaxima.desktop
 
 
 %changelog
-* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-4
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-3
+- Requires: maxima >= 5.18
+
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-2
 - output window of wxMaxima is not visible in RtL locales (#455863)
-- optimize scriptlets
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.2-1
+- wxMaxima-0.8.2
+
+* Sat Apr 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-1
+- wxMaxima-0.8.1
 
 * Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.7.6-3 
 - ExclusiveArch: s/i386/%%ix86/


--- wxMaxima-0.7.6-ltr_layout.patch DELETED ---