SPECS: ardour.spec - %install also needs /proc - install icon for ...

[glen]

Author: glen                         Date: Sat Oct 20 14:11:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %install also needs /proc
- install icon for .desktop

---- Files affected:
SPECS:
   ardour.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/ardour.spec
diff -u SPECS/ardour.spec:1.39 SPECS/ardour.spec:1.40
--- SPECS/ardour.spec:1.39	Sat Oct  6 19:30:18 2007
+++ SPECS/ardour.spec	Sat Oct 20 16:11:16 2007
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Wielościeżkowy magnetofon nagrywający na twardym dysku
 Name:		ardour
 Version:	2.1
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		X11/Applications/Sound
 Source0:	http://ardour.org/files/releases/%{name}-%{version}.tar.bz2
@@ -91,8 +91,14 @@
 %endif
 
 %install
+# Make sure we have /proc mounted - it searches for flags from there
+if [ ! -f /proc/cpuinfo ]; then
+	echo "You need to have /proc mounted in order to build this package!"
+	exit 1
+fi
+
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %scons install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -101,6 +107,7 @@
 #	KSI=yes
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a gtk2_ardour/icons/ardour_icon_48px.png $RPM_BUILD_ROOT%{_pixmapsdir}/ardour.png
 
 # it shouldn't be there
 rm -f $RPM_BUILD_ROOT%{_datadir}/ardour/libardour.{la,a}
@@ -125,6 +132,7 @@
 %attr(755,root,root) %{_bindir}/ardour2
 %{_datadir}/ardour2
 %{_desktopdir}/ardour.desktop
+%{_pixmapsdir}/ardour.png
 
 %dir %{_libdir}/ardour2
 %attr(755,root,root) %{_libdir}/ardour2/ardour-2.1
@@ -148,6 +156,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2007/10/20 14:11:16  glen
+- %install also needs /proc
+- install icon for .desktop
+
 Revision 1.39  2007/10/06 17:30:18  glen
 - pass CXX,CC, files fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ardour.spec?r1=1.39&r2=1.40&f=u