- added desktop patch (fixes Categories in .desktop file)

- moved .desktop file to _desktopdir
- rel. 2

Changed files:
    fung-calc.spec -> 1.4

diff --git a/fung-calc.spec b/fung-calc.spec
index 333ef6d055c1555f86e5a15f2555489fd5ab4cc5..7aea1097277060fd0501e4ce83fa1f59464925c9 100644 (file)
--- a/fung-calc.spec
+++ b/fung-calc.spec
@@ -2,16 +2,17 @@ Summary:      Fung-Calc is a graphing calculator
 Summary(pl):   Fung-calc to kalkulator rysuj±cy wykresy
 Name:          fung-calc
 Version:       1.3.2b
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications/Science
-Source0:       http://dl.sourceforge.net/fung-calc/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Source0-md5: bae7a2d39fd6658d4aa181ddc73bd5d5
+Patch0:                %{name}-desktop.patch
 URL:           http://fung-calc.sourceforge.net/
 BuildRequires: kdelibs-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _htmldir        %{_datadir}/doc/kde/HTML
+%define                _htmldir        %{_datadir}/doc/kde/HTML
 %define                _noautoreqdep   libGL.so.1 libGLU.so.1
 
 %description
@@ -40,10 +41,11 @@ Pliki nag
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
+kde_appsdir="%{_desktopdir}"; export kde_appsdir
 
 %configure
 %{__make}
@@ -54,6 +56,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+mv $RPM_BUILD_ROOT%{_desktopdir}/Applications/* $RPM_BUILD_ROOT%{_desktopdir}
+
 %find_lang %{name} --with-kde
 
 %clean
@@ -71,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 # needed here (incl. GPL COPYING)???
 %{_datadir}/%{name}/[ACRT]*
 %{_datadir}/%{name}/samplegraphs.fgc
-%{_applnkdir}/Applications/%{name}.desktop
+%{_desktopdir}/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/fung_calc.png
 %{_datadir}/mimelnk/application/*.desktop
 %dir %{_datadir}/%{name}/translations