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

diff --git a/MathPlanner.spec b/MathPlanner.spec
index 2e0409c..0bb9759 100644
--- a/MathPlanner.spec
+++ b/MathPlanner.spec
@@ -1,17 +1,15 @@
 Summary:	A Program for calculating many kind of things
 Summary(pl):	Program do ³atwego wykonywania obliczeñ matematycznych
 Name:		MathPlanner
-Version:	3.0.5
+Version:	3.0.6
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Publishing
 Source0:	http://koti.mbnet.fi/jarmonik/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
-Patch0:		%{name}-ac_fix.patch
 URL:		http://koti.mbnet.fi/jarmonik
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	kdelibs-devel >= 3.0.3
 BuildRequires:	libtool
 BuildRequires:	qt-devel >= 3.0.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,14 +31,14 @@ oraz definicje funkcji.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 QTDIR="/usr/X11R6"
 export QTDIR
 
+rm -f missing
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
@@ -48,13 +46,16 @@ aclocal
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_applnkdir}/Scientific}
+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 %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Scientific/
+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
@@ -66,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_mathdir}
 %{_mathdir}/*.txt
 %{_mathdir}/pixmaps/*
-%{_pixmapsdir}/*.xpm
-%{_pixmapsdir}/mini/*.xpm
-%{_applnkdir}/Scientific/*.desktop
+%{_mathdir}/ts/*
+%{_pixmapsdir}/*.png
+%{_pixmapsdir}/hicolor/*/mimetypes/*.png
+%{_datadir}/mimelnk/application/*.desktop
+%{_applnkdir}/Scientific/Mathematics/*.desktop