X-Git-Url: http://git.pld-linux.org/?p=packages%2FMathPlanner.git;a=blobdiff_plain;f=MathPlanner.spec;h=0bb975922846c6b9eb0463fa5289adde7e2ed5bd;hp=513d876f6b954a611d503a20db920686038afef8;hb=4be8898368a1972a8d8feff6a8b25db2eb0137fc;hpb=4f3f224460980ed1e84e14a539250442cfb4e2b7

diff --git a/MathPlanner.spec b/MathPlanner.spec
index 513d876..0bb9759 100644
--- a/MathPlanner.spec
+++ b/MathPlanner.spec
@@ -1,22 +1,21 @@
-# TODO:
-# - desktop
 Summary:	A Program for calculating many kind of things
 Summary(pl):	Program do ³atwego wykonywania obliczeñ matematycznych
 Name:		MathPlanner
-Version:	3.0.2
+Version:	3.0.6
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Publishing
 Source0:	http://koti.mbnet.fi/jarmonik/%{name}-%{version}.tar.gz
-Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-opt.patch
+Source1:	%{name}.desktop
 URL:		http://koti.mbnet.fi/jarmonik
-BuildRequires:	kdelibs-devel >= 3
-BuildRequires:	qt-devel >= 3.0.1
+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}/MathPlanner3
+%define		_mathdir	%{_datadir}/MathPlanner
 
 %description
 MathPlanner is mathematical design and publishing tool. MathPlanner
@@ -31,34 +30,45 @@ Obs
 oraz definicje funkcji.
 
 %prep
-%setup -q -n %{name}3-install
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 %build
-CFLAGS="-I/usr/X11R6/include/qt"
-LDFLAGS="-L/usr/X11R6/lib/qt/plugins-mt/styles/ -lqplatinumstyle -lqmotifstyle"
-export LDFLAGS CFLAGS
-%{__make} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" build
+QTDIR="/usr/X11R6"
+export QTDIR
+
+rm -f missing
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}/mini
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir}/{mini,hicolor/{32x32,64x64}/mimetypes/},%{_applnkdir}/Scientific/Mathematics}
+install -d $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-install icons/mini/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/mini
+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%{_applnkdir}/Scientific/Mathematics
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Changes.txt Doc.htm Doc examples
+%doc AUTHORS ChangeLog NEWS Doc.htm Doc examples
 %attr(755,root,root) %{_bindir}/*
 %dir %{_mathdir}
 %{_mathdir}/*.txt
 %{_mathdir}/pixmaps/*
-%{_pixmapsdir}/*.xpm
-%{_pixmapsdir}/mini/*.xpm
+%{_mathdir}/ts/*
+%{_pixmapsdir}/*.png
+%{_pixmapsdir}/hicolor/*/mimetypes/*.png
+%{_datadir}/mimelnk/application/*.desktop
+%{_applnkdir}/Scientific/Mathematics/*.desktop