X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e16.spec;h=7b7ae58e6614869625a7233a1670c0b6a8655ceb;hb=c84930418079c7b560d5ba88c53dc876ea47e7a6;hp=80a13b00cc8439af59de553ebf6ff04f7718c0b8;hpb=5f3711276450cadef19728476dcf86e357e706ea;p=packages%2Fe16.git

diff --git a/e16.spec b/e16.spec
index 80a13b0..7b7ae58 100644
--- a/e16.spec
+++ b/e16.spec
@@ -1,77 +1,95 @@
 Summary:	Enlightenment Window Manager
-Summary(pl):	X Window menad¿er - Enlightenment  
+Summary(pl):	X Window menad¿er - Enlightenment
 Name:		enlightenment
-Version:	0.16.3
-Release:	2
-Copyright:	GPL
+Version:	0.16.5
+Release:	5
+License:	GPL
 Group:		X11/Window Managers
-Group(pl):	X11/Zarz±dcy Okien
 Source0:	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/%{name}-%{version}.tar.gz
-Source1:	enlightenment.desktop
-Patch0:		enlightenment-config-path.patch
-Patch1:		enlightenment-makefile_fix.patch
+Source1:	%{name}.desktop
+Source2:	%{name}.RunWM
+Source3:	%{name}.wm_style
+Patch0:		%{name}-config-path.patch
+Patch1:		%{name}-makefile_fix.patch
+Patch2:		%{name}-ac_am_fixes.patch
+Patch3:		%{name}-use_sys_snprintf.patch
 URL:		http://www.enlightenment.org/
-BuildRequires:	gtk+-devel >= 1.2.1
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	esound-devel >= 0.2.13
+BuildRequires:	fnlib-devel
+BuildRequires:	freetype1-devel
+BuildRequires:	gettext-devel
+BuildRequires:	gtk+-devel >= 1.2.1
 BuildRequires:	imlib-devel >= 1.9.8
-BuildRequires:	freetype-devel
 BuildRequires:	libghttp-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libpng >= 1.0.8
 BuildRequires:	libtiff-devel
+BuildRequires:	libtool
 BuildRequires:	libungif-devel
 BuildRequires:	zlib-devel
-BuildRequires:	fnlib-devel
-BuildRequires:	XFree86-devel
-BuildRoot:	/tmp/%{name}-%{version}-root
+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
 powerful, extensible, configurable and able to be really good looking.
 
 %description -l pl
-Enlightenment jest najpotê¿niejszym i najpiêkniejszym window-menad¿erem 
-jaki kiedykolwiek zosta³ stworzony dla Linuxa ;)
+Enlightenment jest najpotê¿niejszym i najpiêkniejszym
+window-menad¿erem jaki kiedykolwiek zosta³ stworzony dla Linuxa ;)
 
 %prep
 %setup  -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-LDFLAGS="-s"; export LDFLAGS
-CFLAGS="-I/usr/include/freetype $RPM_OPT_FLAGS"; export CFLAGS
+libtoolize --copy --force
+gettextize --copy --force
+aclocal
+%{__autoconf}
+rm -f missing
+%{__automake}
+CFLAGS="-I%{_includedir}/freetype %{rpmcflags}"
 %configure \
-	--enable-fsstd \
-	--enable-sound
+	--enable-sound=yes
 
-make configdatadir=/etc/X11/enlightenment
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+install -d $RPM_BUILD_ROOT{%{_wmpropsdir},/etc/sysconfig/wmstyle}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-make install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	configdatadir=/etc/X11/enlightenment
+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%{_wmpropsdir}
 
-gzip -9nf AUTHORS README NEWS \
-	$RPM_BUILD_ROOT%{_mandir}/man1/*
+gzip -9nf AUTHORS README NEWS
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc {AUTHORS,README,NEWS}.gz
-%dir /etc/X11/enlightenment
-%config /etc/X11/enlightenment/*
-%attr(755,root,root) /usr/X11R6/bin/*
+%doc *.gz
+%config %{_sysconfdir}
+%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/*