- do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly

[packages/dx.git] / dx.spec

diff --git a/dx.spec b/dx.spec
index c3ba1995e91bf2b57adc60136006e1a81e3bd938..8007add43405634dbe976a6c7bcc4ce445bac5a5 100644 (file)
--- a/dx.spec
+++ b/dx.spec
@@ -1,14 +1,14 @@
 Summary:       Excellent tool for making visualization of data
 Summary(pl):   Doskona³e narzêdzie do wizualizacji danych
 Name:          dx
-Version:       4.3.2
-Release:       9
+Version:       4.4.0
+Release:       1
 License:       IPL
 Group:         Applications
 Source0:       http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
-# Source0-md5: 201afdd86a5ddcfda0dc60fc7b6d3fea
+# Source0-md5: 8fe6a09faea4aa713a1540f51371b719
 Source1:       http://opendx.npaci.edu/source/%{name}samples-%{version}.tar.gz
-# Source1-md5: 940eece74fc2bf001a8017f9df18daac
+# Source1-md5: e8f43722ca0a66282608bded7c0e4f93
 Source2:       %{name}.desktop
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-nolibs.patch
@@ -137,9 +137,7 @@ cd ..
 
 %{__make}
 
-cd %{name}samples-%{version}
-%{__make}
-cd ..
+%{__make} -C %{name}samples-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -147,10 +145,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-cd %{name}samples-%{version}
-%{__make} install \
+%{__make} -C %{name}samples-%{version} install \
        DESTDIR=$RPM_BUILD_ROOT
-cd ..
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir},%{_desktopdir},%{_pixmapsdir}}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -182,7 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dx/lib_linux
 %{_datadir}/dx/ui
 %{_mandir}/manl/*
-%{_desktopdir}/*
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
 
 %files libs