Author: draenog Date: Thu Sep 16 12:14:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.8.6 - fix icon installation - change location of docdir - use wxGTK2-unicode - adapterized
---- Files affected: packages/wxMaxima: wxMaxima.spec (1.11 -> 1.12) , wxMaxima-docdir.patch (NONE -> 1.1) (NEW), wxMaxima-pixmap.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/wxMaxima/wxMaxima.spec diff -u packages/wxMaxima/wxMaxima.spec:1.11 packages/wxMaxima/wxMaxima.spec:1.12 --- packages/wxMaxima/wxMaxima.spec:1.11 Wed Aug 27 18:48:34 2008 +++ packages/wxMaxima/wxMaxima.spec Thu Sep 16 14:14:32 2010 @@ -2,15 +2,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) @@ -25,10 +29,16 @@ %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} @@ -39,7 +49,6 @@ 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 @@ -59,6 +68,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2010/09/16 12:14:32 draenog +- up to 0.8.6 +- fix icon installation +- change location of docdir +- use wxGTK2-unicode +- adapterized + Revision 1.11 2008/08/27 16:48:34 rotom - up to 0.7.5 ================================================================ Index: packages/wxMaxima/wxMaxima-docdir.patch diff -u /dev/null packages/wxMaxima/wxMaxima-docdir.patch:1.1 --- /dev/null Thu Sep 16 14:14:37 2010 +++ packages/wxMaxima/wxMaxima-docdir.patch Thu Sep 16 14:14:32 2010 @@ -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 ================================================================ Index: packages/wxMaxima/wxMaxima-pixmap.patch diff -u /dev/null packages/wxMaxima/wxMaxima-pixmap.patch:1.1 --- /dev/null Thu Sep 16 14:14:37 2010 +++ packages/wxMaxima/wxMaxima-pixmap.patch Thu Sep 16 14:14:32 2010 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wxMaxima/wxMaxima.spec?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit