X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffvwm-crystal.git;a=blobdiff_plain;f=fvwm-crystal.spec;h=0adc590bb227f2ee7e6f0bef18823930edf3bba6;hp=545455e1ee3c1413445559dea18b866fe4a744ae;hb=HEAD;hpb=d3f11aa66096739764a44a67fbcdc1d7e4d48ad2

diff --git a/fvwm-crystal.spec b/fvwm-crystal.spec
index 545455e..0adc590 100644
--- a/fvwm-crystal.spec
+++ b/fvwm-crystal.spec
@@ -1,28 +1,36 @@
 Summary:	Desktop Environment
 Summary(pl.UTF-8):	Graficzne środowisko robocze
 Name:		fvwm-crystal
-Version:	3.0.6
+Version:	3.2.3
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://download.gna.org/fvwm-crystal/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	82e2800882abb2c822519f1aa4dc0c72
+Source0:	http://downloads.sourceforge.net/fvwm-crystal/%{name}-%{version}.tar.gz
+# Source0-md5:	0395c795981b32527ecdc07693f9db82
+Patch0:		%{name}-temperature.patch
 URL:		http://www.fvwm-crystal.org/
 BuildRequires:	sed >= 4.0
 Requires:	ImageMagick
-Requires:	aterm
-Requires:	fvwm2 >= 2.5.13
+Requires:	Thunar
+Requires:	alsa-utils
+Requires:	awk
+Requires:	bc
+Requires:	coreutils
+Requires:	feh
+Requires:	fvwm2 >= 2.6.5
 Requires:	fvwm2-perl
-Requires:	habak
-Requires:	mpc
-Requires:	mpd
-Requires:	python
-Requires:	rox
-Requires:	scrot
+Requires:	gksu
+Requires:	mplayer
+Requires:	mrxvt
+Requires:	sed
+Requires:	stalonetray
 Requires:	sudo
-Requires:	trayer
-Requires:	xmms-shell
+Requires:	urxvt
+Requires:	xorg-app-transset
+Requires:	xorg-app-xcompmgr
+Requires:	xorg-app-xrandr
+Requires:	xorg-app-xwd
 Requires:	xscreensaver
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,21 +47,25 @@ wyglądające i bardzo funkcjonalne środowisko robocze.
 
 %prep
 %setup -q
+%patch0 -p1
+
+%build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_prefix}/share/xsessions
-install addons/fvwm-crystal.desktop $RPM_BUILD_ROOT%{_prefix}/share/xsessions
-rm -f   addons/fvwm-crystal.desktop
-
-%{__make} install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -dv $RPM_BUILD_ROOT%{_bindir}
+install -dv $RPM_BUILD_ROOT%{_datadir}/%{name}/fvwm
+install -dv $RPM_BUILD_ROOT%{_datadir}/xsessions
+install -dv $RPM_BUILD_ROOT%{_sysconfdir}/X11/Sessions
+install -dv $RPM_BUILD_ROOT%{_mandir}/man1
+install -dv $RPM_BUILD_ROOT%{_docdir}/%{name}
+install -dv $RPM_BUILD_ROOT%{_datadir}/%{name}/addons
 
-%{__make} install-doc \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -v bin/fvwm-crystal* $RPM_BUILD_ROOT%{_bindir}
+cp -rv fvwm/* $RPM_BUILD_ROOT%{_datadir}/%{name}/fvwm
+cp -v man/* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -rv addons/* $RPM_BUILD_ROOT%{_datadir}/%{name}/addons
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,11 +73,12 @@ 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
+%doc doc/* AUTHORS Contribute COPYING NEWS ChangeLog Export.README README INSTALL
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/fvwm
 %dir %{_datadir}/%{name}/addons
+%dir %{_sysconfdir}/X11/Sessions
 %attr(755,root,root) %{_datadir}/%{name}/fvwm/Applications
 %{_datadir}/%{name}/fvwm/colorsets
 %{_datadir}/%{name}/fvwm/components
@@ -78,4 +91,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/addons/*
 %attr(755,root,root) %{_datadir}/%{name}/fvwm/scripts
 %{_datadir}/%{name}/fvwm/wallpapers
-%{_datadir}/xsessions/fvwm-crystal.desktop
+%{_mandir}/man1/*.1*