X-Git-Url: http://git.pld-linux.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=aewm.spec;h=2c4f2cae9e117dd000107db30c1d404fc837566d;hb=7318595ca1a3ea5dd2c2753753aafe2fa1cc61ba;hp=e0200be093c915cdc3c15251f3e08bba95623dfa;hpb=b8d48203cb8118b10291ee2446d22487c6b3a357;p=packages%2Faewm.git

diff --git a/aewm.spec b/aewm.spec
index e0200be..2c4f2ca 100644
--- a/aewm.spec
+++ b/aewm.spec
@@ -1,15 +1,20 @@
 Summary:	AEWM - the ascetic window manager
 Summary(pl):	AEWM - "ascetyczny" zarz±dca okien
 Name:		aewm
-Version:	1.2.2
+Version:	1.3.1
 Release:	1
 License:	MIT
 Group:		X11/Window Managers
 Source0:	http://www.red-bean.com/~decklin/aewm/%{name}-%{version}.tar.gz
+# Source0-md5:	d357a30c29540101d0545a3c9167bba0
 Source1:	%{name}.desktop
+Source2:	%{name}-xsession.desktop
+Patch0:		%{name}-xft.patch
+Patch1:		%{name}-amd64.patch
 URL:		http://www.red-bean.com/~decklin/aewm/
-BuildRequires:	gtk+-devel
-BuildRequires:	glibc-devel
+BuildRequires:	gtk+2-devel
+BuildRequires:	openmotif-devel
+BuildRequires:	xft-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_wmpropsdir	/usr/share/wm-properties
@@ -25,18 +30,33 @@ Jego zalet
 
 %prep
 %setup -q
+%patch0 -p1
+%if "%{_lib}" == "lib64"
+%patch1 -p1
+%endif
 
 %build
-%{__make} CFLAGS="%{rpmcflags}"
+%{__make} \
+	CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_wmpropsdir}}
+install -d \
+	$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_sysconfdir}/X11/%{name}} \
+	$RPM_BUILD_ROOT%{_wmpropsdir} \
+	$RPM_BUILD_ROOT%{_datadir}/xsessions
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	XROOT=%{_prefix} \
+	MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{aemenu-*,aepanel-*,aesession.*,set-gnome-pda.*}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+install src/aewmrc.sample $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/aewmrc
+install clients/clientsrc.sample $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/clientsrc
+
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{aemenu-*,aepanel-*,aesession.*,set-gnome-pda.*,switch-desk.*}
 echo ".so aeclients.1x" > $RPM_BUILD_ROOT%{_mandir}/man1/aemenu-gtk.1x
 echo ".so aeclients.1x" > $RPM_BUILD_ROOT%{_mandir}/man1/aemenu-xaw.1x
 echo ".so aeclients.1x" > $RPM_BUILD_ROOT%{_mandir}/man1/aepanel-gtk.1x
@@ -49,7 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README ChangeLog
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/%{name}/*rc
+%doc README NEWS TODO
 %attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*
+%{_mandir}/man1/*