X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fvwm-crystal.spec;h=25e483661e2dbbd1211236d471d7a82ec6434a2f;hb=0bcd434c3051f913a2b391b36c5a4da0f075d549;hp=a1ecc5aa510ab885f22b38c506d34b985b48346c;hpb=83f5e64128727d5ecac4616aeb8e063471315a7b;p=packages%2Ffvwm-crystal.git

diff --git a/fvwm-crystal.spec b/fvwm-crystal.spec
index a1ecc5a..25e4836 100644
--- a/fvwm-crystal.spec
+++ b/fvwm-crystal.spec
@@ -1,52 +1,70 @@
-Summary:	Theme for fvwm2
-Summary(pl):	Skórka do fvwm2
+
+#	TODO:	
+#
+
+Summary:	Desktop Environment
+Summary(pl):	Graficzne ¶rodowisko robocze
 Name:		fvwm-crystal
-Version:	1.0.2
-Release:	1
-License:	GPL v2
+Version:	3.0
+Release:	0.1
+Epoch:		1
+License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	ftp://ftp.linuxpl.org/%{name}/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5:	61791a8d8c264a51ac25bf7f4dcbda64
-Patch0:		%{name}-paths.patch
-URL:		http://www.linuxpl.org/software/fvwm-crystal/
-BuildRequires:	rpm-perlprov
-BuildRequires:	imlib2-devel
-Requires:	fvwm2 >= 2.5.8
+Source0:	http://download.berlios.de/fvwm-crystal/%{name}-%{version}.tar.gz
+# Source0-md5:	412f9b6148e35f07b7f1e76759f781b5
+URL:		http://fvwm-crystal.berlios.de/
+Requires:	aterm
+Requires:	fvwm2 >= 2.5.13
 Requires:	fvwm2-perl
-Requires:	scrot
 Requires:	habak
-Requires:	aterm
-Requires:	xdaliclock
+Requires:	ImageMagick
+Requires:	mpc
+Requires:	mpd
+Requires:	python
+Requires:	rox
+Requires:	scrot
+Requires:	sudo
+Requires:	trayer
+Requires:	xmms-shell
+Requires:	xscreensaver
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-A theme for fvwm2.
+FVWM-Crystal is a set of configuration files for F* Virtual Window 
+Manager (FVWM), which can create for you a good looking, very 
+functional desktop environment.
 
 %description -l pl
-Skórka do fvwm2, bardzo rozbudowana.
+FVWM-Crystal jest zestawem plików konfiguracyjnych dla F* Virtual 
+Window Manager (FVWM), dziêki którym stworzone mo¿e byæ dobrze 
+wygl±daj±ce i bardzo funkcjonalne ¶rodowisko robocze.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}
 
 %build
 
+%configure --prefix=%{_prefix} 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_bindir}}
-
-find -type d -name CVS | xargs rm -rf
+%{__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}
 
-mv bin/* $RPM_BUILD_ROOT%{_bindir}/
-mv images config wallpapers $RPM_BUILD_ROOT%{_datadir}/%{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
 
 %files
 %defattr(644,root,root,755)
-%doc doc/[FT]* AUTHORS ChangeLog INSTALL* NEWS README
+# COPYING contains only note, not full GPL text
+%doc doc/* AUTHORS INSTALL COPYING NEWS README
 %attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
+%{_prefix}/share/xsessions/fvwm-crystal.desktop