X-Git-Url: http://git.pld-linux.org/?p=packages%2FMathPlanner.git;a=blobdiff_plain;f=MathPlanner.spec;h=7e2100336823ff3199db4b2bf86b08cc8a8e6c54;hp=2c643ed4f7052a047db5637da7244a994cfa958e;hb=1b0eb60ac9de13076a04eb9873b6257a4f607539;hpb=40a876b3c988d38edcd2d1681c761a50d8526753

diff --git a/MathPlanner.spec b/MathPlanner.spec
index 2c643ed..7e21003 100644
--- a/MathPlanner.spec
+++ b/MathPlanner.spec
@@ -1,21 +1,21 @@
 Summary:	A Program for calculating many kind of things
 Summary(pl):	Program do ³atwego wykonywania obliczeñ matematycznych
 Name:		MathPlanner
-Version:	3.0.5
-Release:	2
+Version:	3.1.3
+Release:	0.1
 License:	GPL v2
 Group:		X11/Applications/Publishing
 Source0:	http://koti.mbnet.fi/jarmonik/%{name}-%{version}.tar.gz
+# Source0-md5:	803a8de68056a4ec2e4c456b1ba9b320
 Source1:	%{name}.desktop
-Patch0:		%{name}-ac_fix.patch
-URL:		http://koti.mbnet.fi/jarmonik
+Patch0:		MathPlanner-no_qstyles.patch
+URL:		http://koti.mbnet.fi/jarmonik/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	qt-devel >= 3.0.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
 %define		_mathdir	%{_datadir}/MathPlanner
 
 %description
@@ -32,14 +32,15 @@ oraz definicje funkcji.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0
 
 %build
-QTDIR="/usr/X11R6"
+QTDIR="%{_prefix}"
 export QTDIR
 
+rm -f missing
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
@@ -47,13 +48,17 @@ aclocal
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_applnkdir}/Scientific/Mathematics}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir}/{mini,hicolor/{32x32,64x64}/mimetypes/},%{_desktopdir}} \
+	$RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-install icons/mini/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/mini
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Scientific/Mathematics
+install icons/64x64/apps/*.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install icons/64x64/mimetypes/*.png $RPM_BUILD_ROOT%{_pixmapsdir}/hicolor/64x64/mimetypes/
+install icons/32x32/mimetypes/*.png $RPM_BUILD_ROOT%{_pixmapsdir}/hicolor/32x32/mimetypes/
+install mpl2.desktop $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_mathdir}
 %{_mathdir}/*.txt
 %{_mathdir}/pixmaps/*
-%{_pixmapsdir}/*.xpm
-%{_pixmapsdir}/mini/*.xpm
-%{_applnkdir}/Scientific/Mathematics/*.desktop
+%{_mathdir}/ts/*
+%{_pixmapsdir}/*.png
+%{_pixmapsdir}/hicolor/*/mimetypes/*.png
+%{_datadir}/mimelnk/application/*.desktop
+%{_desktopdir}/*.desktop