From 5a261f416aa5950e899a0c797a5a7899de2c2d80 Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Thu, 16 Sep 2010 12:14:32 +0000 Subject: [PATCH] - up to 0.8.6 - fix icon installation - change location of docdir - use wxGTK2-unicode - adapterized Changed files: wxMaxima-docdir.patch -> 1.1 wxMaxima-pixmap.patch -> 1.1 wxMaxima.spec -> 1.12 --- wxMaxima-docdir.patch | 10 ++++++++++ wxMaxima-pixmap.patch | 12 ++++++++++++ wxMaxima.spec | 21 +++++++++++++++------ 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 wxMaxima-docdir.patch create mode 100644 wxMaxima-pixmap.patch diff --git a/wxMaxima-docdir.patch b/wxMaxima-docdir.patch new file mode 100644 index 0000000..46028e0 --- /dev/null +++ b/wxMaxima-docdir.patch @@ -0,0 +1,10 @@ +--- Makefile.am.orig 2010-09-16 12:36:47.684186133 +0100 ++++ Makefile.am 2010-09-16 12:37:09.314201328 +0100 +@@ -15,7 +15,6 @@ + art/wxmac-doc.icns art/wxmac.icns \ + art/maximaicon.ico + +-docdir = ${datadir}/wxMaxima + doc_DATA = README COPYING + + wxMaxima.app: all diff --git a/wxMaxima-pixmap.patch b/wxMaxima-pixmap.patch new file mode 100644 index 0000000..16f887e --- /dev/null +++ b/wxMaxima-pixmap.patch @@ -0,0 +1,12 @@ +diff -ur wxMaxima-0.8.6/data/Makefile.am wxMaxima-0.8.6.new/data/Makefile.am +--- wxMaxima-0.8.6/data/Makefile.am 2009-11-12 19:52:21.000000000 +0000 ++++ wxMaxima-0.8.6.new/data/Makefile.am 2010-09-15 23:34:03.951722310 +0100 +@@ -1,4 +1,7 @@ + wxmaximadatadir = ${datadir}/wxMaxima +-wxmaximadata_DATA = tips.txt wxmathml.lisp wxmaxima.png autocomplete.txt ++wxmaximadata_DATA = tips.txt wxmathml.lisp autocomplete.txt ++ ++pixmapsdir = ${datadir}/pixmaps ++pixmaps_DATA = wxmaxima.png + + EXTRA_DIST = tips.txt wxmathml.lisp wxmaxima.png Info.plist.in PkgInfo autocomplete.txt diff --git a/wxMaxima.spec b/wxMaxima.spec index c981dfa..8df4e7f 100644 --- a/wxMaxima.spec +++ b/wxMaxima.spec @@ -1,15 +1,19 @@ Summary: wxWidgets interface for maxima Summary(pl.UTF-8): Interfejs do maximy używający wxWidgets Name: wxMaxima -Version: 0.7.5 +Version: 0.8.6 Release: 1 License: GPL Group: Applications/Math -Source0: http://dl.sourceforge.net/wxmaxima/%{name}-%{version}.tar.gz -# Source0-md5: 469014a84aca3f334d1e19042208d54b +Source0: http://downloads.sourceforge.net/wxmaxima/%{name}-%{version}.tar.gz +# Source0-md5: 7b5528276fc37ddca2cbab7c75fe6280 +Patch0: %{name}-pixmap.patch +Patch1: %{name}-docdir.patch URL: http://wxmaxima.sourceforge.net/ +BuildRequires: autoconf +BuildRequires: automake BuildRequires: libxml2-devel -BuildRequires: wxGTK2-devel +BuildRequires: wxGTK2-unicode-devel BuildRequires: wxWidgets-devel Requires: maxima >= 1:5.11.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -24,10 +28,16 @@ komputerowej Maxima. %prep %setup -q +%patch0 -p1 +%patch1 -p0 %build +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} %{configure}\ - --with-wx-config=/usr/bin/wx-gtk2-ansi-config + --with-wx-config=%{_bindir}/wx-gtk2-unicode-config %{__make} @@ -38,7 +48,6 @@ rm -rf $RPM_BUILD_ROOT install -D wxmaxima.desktop $RPM_BUILD_ROOT%{_desktopdir}/wxmaxima.desktop sed -e "s@Application;Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;@Science;Math;@g" -i $RPM_BUILD_ROOT%{_desktopdir}/wxmaxima.desktop -install -D wxmaxima.png $RPM_BUILD_ROOT%{_pixmapsdir}/wxmaxima.png %find_lang %{name} %clean -- 2.44.0