SPECS: fvwm-crystal.spec - up to version 3.0 RC2 - added reqs (mpd...

[mguevara]

Author: mguevara                     Date: Wed Oct 12 11:36:28 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to version 3.0 RC2
- added reqs (mpd, mpc, xmms-shell, xscreensaver, python, ImageMagick, 
  sudo), removed some too (xdaliclock)
- short desc update
- new build system 

---- Files affected:
SPECS:
   fvwm-crystal.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/fvwm-crystal.spec
diff -u SPECS/fvwm-crystal.spec:1.19 SPECS/fvwm-crystal.spec:1.20
--- SPECS/fvwm-crystal.spec:1.19	Wed Aug 31 17:42:29 2005
+++ SPECS/fvwm-crystal.spec	Wed Oct 12 13:36:23 2005
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
 
-#	TODO:	- fix requires, because the new version needs some more,
-#			  like Python for scripts or mpc/xmms-shell for music.
+#	TODO:	
+#
 
-%define	_rc	RC1
+%define	_rc	RC2
 
-Summary:	Theme for fvwm2
-Summary(pl):	Skórka do fvwm2
+Summary:	Desktop Environment
+Summary(pl):	Graficzne środowisko robocze
 Name:		fvwm-crystal
 Version:	3.0
 Release:	0.%{_rc}.1
@@ -14,16 +14,22 @@
 License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	http://download.berlios.de/fvwm-crystal/%{name}-%{version}.%{_rc}.tar.gz
-# Source0-md5:	ddc3437763b7dc6b140560a9ba829e8d
+# Source0-md5:	798a08fa0273f5994cadc9ba130aeae2
 URL:		http://fvwm-crystal.berlios.de/
 Requires:	aterm
 Requires:	fvwm2 >= 2.5.13
 Requires:	fvwm2-perl
 Requires:	habak
 Requires:	scrot
-Requires:	xdaliclock
 Requires:	trayer
 Requires:	rox
+Requires:	ImageMagick
+Requires:	python
+Requires:	sudo
+Requires:	mpc
+Requires:	mpd
+Requires:	xmms-shell
+Requires:	xscreensaver
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,12 +45,21 @@
 %prep
 %setup -q -n %{name}-%{version}.%{_rc}
 
+%build
+
+%configure --prefix=%{_prefix} 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_bindir}}
 
-install bin/* $RPM_BUILD_ROOT%{_bindir}
-cp -a fvwm/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+%{__make} install  \
+    bindir=$RPM_BUILD_ROOT%{_prefix}/bin \
+    datadir=$RPM_BUILD_ROOT%{_prefix}/share
+    
+sed -i 's#\%\%\%INSTALLPATH\%\%\%#"%{_datadir}/%{name}/fvwm"#g' $RPM_BUILD_ROOT%{_bindir}/%{name}
+
+install -d $RPM_BUILD_ROOT%{_prefix}/share/xsessions/
+install addons/fvwm-crystal.desktop $RPM_BUILD_ROOT%{_prefix}/share/xsessions/fvwm-crystal.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +70,7 @@
 %doc doc/* AUTHORS INSTALL COPYING NEWS README
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
+%{_prefix}/share/xsessions/fvwm-crystal.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +78,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/10/12 11:36:23  mguevara
+- up to version 3.0 RC2
+- added reqs (mpd, mpc, xmms-shell, xscreensaver, python, ImageMagick,
+  sudo), removed some too (xdaliclock)
+- short desc update
+- new build system
+
 Revision 1.19  2005/08/31 15:42:29  prism
 - updated to 3.0RC1,
 - epoch++ (versioning changed),
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fvwm-crystal.spec?r1=1.19&r2=1.20&f=u