--- qsampler/trunk/qsampler.spec.in	2010/04/13 07:16:54	2083
+++ qsampler/trunk/qsampler.spec.in	2010/05/17 08:36:20	2092
@@ -1,13 +1,13 @@
 %define name    @PACKAGE_TARNAME@
 %define version @PACKAGE_VERSION@
-%define release 12
-%define prefix  @ac_prefix@
+%define release 13
+
+%define _prefix	@ac_prefix@
 
 Summary:	A LinuxSampler Qt GUI interface
 Name:		%{name}
 Version:	%{version}
 Release:	%{release}
-Prefix:		%{prefix}
 License:	GPL
 Group:		Productivity/Multimedia/Sound/Midi
 Source0:	%{name}-%{version}.tar.gz
@@ -16,8 +16,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 BuildRequires:	libqt4-devel >= 4.1
-BuildRequires:	liblscp-devel >= 0.5.5
-BuildRequires:	libgig-devel >= 3.2.0
+BuildRequires:	liblscp-devel >= 0.5.6
+BuildRequires:	libgig-devel >= 3.3.0
 
 %description
 QSampler is a LinuxSampler GUI front-end application written in C++ around
@@ -29,25 +29,31 @@
 [ -f Makefile.svn ] && %__make -f Makefile.svn
 
 %build
-export PATH=$QTDIR/bin:$PATH
 %configure
 %__make
 
 %install
-%makeinstall
+%__make DESTDIR=%{buildroot} install
 
 %clean
-[ -d %{buildroot} -a "%{buildroot}" != "" ] && %__rm -rf  %{buildroot}
+[ -d %{buildroot} -a "%{buildroot}" != "" ] && %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/%{name}
+%dir %{_datadir}/applications
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/32x32
+%dir %{_datadir}/icons/hicolor/32x32/apps
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%dir %{_datadir}/locale
 %{_datadir}/locale/%{name}_*.qm
 
 %changelog
+* Mon May 17 2010 Rui Nuno Capela <rncbc@users.sourceforge.net>
+- Standard desktop icon fixing. 
 * Sat Aug  1 2009 Rui Nuno Capela <rncbc@users.sourceforge.net>
 - New 0.2.2 release.
 * Thu Dec 6 2007 Rui Nuno Capela <rncbc@users.sourceforge.net>