+
+# TODO: - fix requires, because the new version needs some more,
+# like Python for scripts or mpc/xmms-shell for music.
+
+%define _rc RC1
+
Summary: Theme for fvwm2
Summary(pl): Skórka do fvwm2
Name: fvwm-crystal
-Version: 1.0.1
-Release: 2
-License: GPL v2
+Version: 3.0
+Release: 0.%{_rc}.1
+Epoch: 1
+License: GPL v2+
Group: X11/Window Managers
-Source0: ftp://ftp.linuxpl.org/%{name}/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5: 53038c173567976be13ba94f3b47141c
-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}.%{_rc}.tar.gz
+# Source0-md5: ddc3437763b7dc6b140560a9ba829e8d
+URL: http://fvwm-crystal.berlios.de/
+Requires: aterm
+Requires: fvwm2 >= 2.5.13
Requires: fvwm2-perl
-Requires: scrot
Requires: habak
-Requires: aterm
+Requires: scrot
Requires: xdaliclock
+Requires: trayer
+Requires: rox
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
-
-%build
+%setup -q -n %{name}-%{version}.%{_rc}
%install
rm -rf $RPM_BUILD_ROOT
-
install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_bindir}}
-find -type d -name CVS | xargs rm -rf
-
-mv bin/* $RPM_BUILD_ROOT%{_bindir}/
-mv images config wallpapers $RPM_BUILD_ROOT%{_datadir}/%{name}
+install bin/* $RPM_BUILD_ROOT%{_bindir}
+cp -a fvwm/* $RPM_BUILD_ROOT%{_datadir}/%{name}
%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}