- use more macros, some cosmetics, added missing "rm -f missing" and use new %doc

[packages/MathPlanner.git] / MathPlanner.spec

diff --git a/MathPlanner.spec b/MathPlanner.spec
index 889990ff7db39de72214ebc11a90998d968c2f6d..0bb975922846c6b9eb0463fa5289adde7e2ed5bd 100644 (file)
--- a/MathPlanner.spec
+++ b/MathPlanner.spec
@@ -1,24 +1,21 @@
-# TODO:
-# - desktop

 Summary:       A Program for calculating many kind of things
 Summary(pl):   Program do ³atwego wykonywania obliczeñ matematycznych
 Name:          MathPlanner
 Summary:       A Program for calculating many kind of things
 Summary(pl):   Program do ³atwego wykonywania obliczeñ matematycznych
 Name:          MathPlanner

-Version:       3.0.4
-Release:       0.1
+Version:       3.0.6
+Release:       1

 License:       GPL v2
 Group:         X11/Applications/Publishing
 Source0:       http://koti.mbnet.fi/jarmonik/%{name}-%{version}.tar.gz
 License:       GPL v2
 Group:         X11/Applications/Publishing
 Source0:       http://koti.mbnet.fi/jarmonik/%{name}-%{version}.tar.gz

-Patch0:                %{name}-ac_fix.patch
+Source1:       %{name}.desktop

 URL:           http://koti.mbnet.fi/jarmonik
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://koti.mbnet.fi/jarmonik
 BuildRequires: autoconf
 BuildRequires: automake

-BuildRequires: kdelibs-devel >= 3

 BuildRequires: libtool
 BuildRequires: libtool

-BuildRequires: qt-devel >= 3.0.1
+BuildRequires: qt-devel >= 3.0.5

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 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
 
 %description
 MathPlanner is mathematical design and publishing tool. MathPlanner


@@ -34,14 +31,14 @@ oraz definicje funkcji.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0

 
 %build
 QTDIR="/usr/X11R6"
 export QTDIR
 
 
 %build
 QTDIR="/usr/X11R6"
 export QTDIR
 

+rm -f missing

 %{__libtoolize}
 %{__libtoolize}

-aclocal
+%{__aclocal}

 %{__autoconf}
 %{__automake}
 %configure
 %{__autoconf}
 %{__automake}
 %configure


@@ -49,22 +46,29 @@ aclocal
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %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
 
 
 %{__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)
 
 %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/*
 %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