- use _desktopdir macro, missing dirs

[packages/d4x.git] / d4x.spec

diff --git a/d4x.spec b/d4x.spec
index 81f856f73781220b2486fa99b7f8eef8781666c9..93928789997d4e4047107e5cc64036014f018f92 100644 (file)
--- a/d4x.spec
+++ b/d4x.spec
@@ -1,4 +1,3 @@
-
 Summary:       Downloader for X - ftp/http download manager for X window system
 Summary(pl):   Program do pobierania plików poprzez ftp/http dla X, czyli Downloader for X
 Name:          d4x
@@ -24,7 +23,6 @@ BuildRequires:        libstdc++-devel
 Obsoletes:     nt
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 This program lets you download files from internet/intranet using FTP
 or HTTP protocol. Main features:
@@ -82,11 +80,12 @@ rm -f missing
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_datadir}/applications,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-install share/nt.desktop $RPM_BUILD_ROOT%{_datadir}/applications
+install share/nt.desktop $RPM_BUILD_ROOT%{_desktopdir}
 install share/{*.xpm,*.png} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 mv -f DOC/FAQ.gr DOC/FAQ.el
@@ -110,9 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(755,root,root) %{_bindir}/nt
 %attr(755,root,root) %{_bindir}/d4x
+%dir %{_datadir}/d4x
+%{_datadir}/d4x/sounds
+%{_datadir}/d4x/themes
+%{_datadir}/d4x/ftpsearch.xml
 %{_mandir}/man1/*
-%{_datadir}/applications/nt.desktop
+%{_desktopdir}/nt.desktop
 %{_pixmapsdir}/*
-%{_datadir}/d4x/sounds/*
-%{_datadir}/d4x/themes/*
-%{_datadir}/d4x/ftpsearch.xml