- rm -f SIGSEGV ;)

[packages/e16.git] / e16.spec

diff --git a/e16.spec b/e16.spec
index 1a50f682a51de1fca584f5ca1b4787e40875f098..6f29eb2e9e4ecd92736fc6c4eea667f4dc020251 100644 (file)
--- a/e16.spec
+++ b/e16.spec
@@ -2,7 +2,7 @@ Summary:        Enlightenment Window Manager
 Summary(pl):   X Window menad¿er - Enlightenment  
 Name:          enlightenment
 Version:       0.16.5
-Release:       1
+Release:       3
 License:       GPL
 Group:         X11/Window Managers
 Group(de):     X11/Fenstermanager
@@ -15,23 +15,30 @@ Source2:    %{name}.RunWM
 Source3:       %{name}.wm_style
 Patch0:                %{name}-config-path.patch
 Patch1:                %{name}-makefile_fix.patch
+Patch2:                %{name}-ac_am_fixes.patch
 URL:           http://www.enlightenment.org/
-BuildRequires: gtk+-devel >= 1.2.1
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.13
-BuildRequires: imlib-devel >= 1.9.8
+BuildRequires: fnlib-devel
+BuildRequires: freetype1-devel
 BuildRequires: gettext-devel 
-BuildRequires: freetype-devel
+BuildRequires: gtk+-devel >= 1.2.1
+BuildRequires: imlib-devel >= 1.9.8
 BuildRequires: libghttp-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libtiff-devel
+BuildRequires: libtool
 BuildRequires: libungif-devel
 BuildRequires: zlib-devel
-BuildRequires: fnlib-devel
 Requires:      xinitrc >= 3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+%define                _wmpropsdir     %{_datadir}/wm-properties
+%define                _sysconfdir     /etc/X11/enlightenment
 
 %description
 Enlightenment is a Windowmanager for X-Windows that is designed to be
@@ -45,30 +52,33 @@ window-menad
 %setup  -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+libtoolize --copy --force
 gettextize --copy --force
-CFLAGS="-I%{_includedir}/freetype %{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}"
+aclocal
+autoconf
+rm -f missing
+automake -a -c
+CFLAGS="-I%{_includedir}/freetype %{rpmcflags}"
 %configure \
-       --enable-fsstd \
        --enable-sound
 
-%{__make} configdatadir=%{_sysconfdir}/X11/enlightenment
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties \
-       $RPM_BUILD_ROOT/etc/sysconfig/wmstyle
+install -d $RPM_BUILD_ROOT{%{_wmpropsdir},/etc/sysconfig/wmstyle}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       configdatadir=%{_sysconfdir}/X11/enlightenment
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.sh
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/%{name}.names
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
 
-gzip -9nf AUTHORS README NEWS \
+gzip -9nf AUTHORS README NEWS
 
 %find_lang %{name}
 
@@ -78,11 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc *.gz
-%dir %{_sysconfdir}/X11/enlightenment
-%config %{_sysconfdir}/X11/enlightenment/*
+%{_sysconfdir}/config
 %attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 /etc/sysconfig/wmstyle/*.names
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/enlightenment
-%{_datadir}/gnome/wm-properties/*
+%{_wmpropsdir}/*
 %{_mandir}/man1/*