--- qsampler/trunk/qsampler.spec.in	2009/08/01 16:52:05	1964
+++ qsampler/trunk/qsampler.spec.in	2010/07/10 09:47:33	2107
@@ -1,13 +1,13 @@
 %define name    @PACKAGE_TARNAME@
 %define version @PACKAGE_VERSION@
-%define release 11
-%define prefix  @ac_prefix@
+%define release 14
+
+%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
@@ -15,42 +15,45 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-Requires:	qt >= 4.2
-Requires:	liblscp >= 0.5.5
-Requires:	libgig >= 3.2.0
-
-BuildRequires:	qt-devel >= 4.2
-BuildRequires:	liblscp-devel >= 0.5.5
-BuildRequires:	libgig-devel >= 3.2.0
+BuildRequires:	libqt4-devel >= 4.2
+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
-the Qt3 toolkit using Qt Designer. For the moment it just wraps the client
+the Qt4 toolkit using Qt Designer. For the moment it just wraps the client
 interface of LinuxSampler Control Protocol (LSCP) (http://www.linuxsampler.org).
 
 %prep
 %setup
-[ -f Makefile.cvs ] && %__make -f Makefile.cvs
+[ -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
+#dir %{_datadir}/applications
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/32x32
+%dir %{_datadir}/icons/hicolor/32x32/apps
+#dir %{_datadir}/locale
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_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>