- COPYING note, fixed short-circuit, removed unused BRs

Changed files:
    fvwm-crystal.spec -> 1.16

diff --git a/fvwm-crystal.spec b/fvwm-crystal.spec
index d6f62a9be9cccfc3c2fef5e3fa3e82e06ccd3f9d..6f01f9a9ae9593c84b317add3471016956479ba6 100644 (file)
--- a/fvwm-crystal.spec
+++ b/fvwm-crystal.spec
@@ -3,19 +3,17 @@ Summary(pl):  Sk
 Name:          fvwm-crystal
 Version:       20040929
 Release:       1
-License:       GPL v2
+License:       GPL v2+
 Group:         X11/Window Managers
 Source0:       http://fvwm-crystal.berlios.de/files/files/fvwm-crystal/%{name}-%{version}.tar.gz
 # Source0-md5: 067558677408dfa2f846a2c343f5705d
 Patch0:                %{name}-paths.patch
 URL:           http://fvwm-crystal.berlios.de/
-BuildRequires: rpm-perlprov
-BuildRequires: imlib2-devel
+Requires:      aterm
 Requires:      fvwm2 >= 2.5.8
 Requires:      fvwm2-perl
-Requires:      scrot
 Requires:      habak
-Requires:      aterm
+Requires:      scrot
 Requires:      xdaliclock
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,24 +27,19 @@ Sk
 %setup -q
 # %patch0 -p1
 
-%build
-
 %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 fvwm/* $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)
+# 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}