X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e16.spec;h=0ea26800eac802081139627d8179ffef889b596d;hb=309a62f89615979b351249d37da966bead39f6a5;hp=4744ed03186af5dec632f4c881887d6fefa27281;hpb=52d59aeb8c317a894126c15dba434565e6e49291;p=packages%2Fe16.git

diff --git a/e16.spec b/e16.spec
index 4744ed0..0ea2680 100644
--- a/e16.spec
+++ b/e16.spec
@@ -1,74 +1,88 @@
+# TODO:
+#	- fix attempts to use bogus path (differentiate absolute and relative
+#	  pathnames)
+#	- fix applnk submenu handling (for Ra)
+#	- use the translated (locale dependent) script menu generating (???)
+#
 Summary:	Enlightenment Window Manager
-Summary(pl):	X Window menad¿er - Enlightenment  
+Summary(pl):	Zarz±dca okien X - Enlightenment
 Name:		enlightenment
-Version:	0.16.5
-Release:	3
+Version:	0.16.6
+Release:	2
 License:	GPL
 Group:		X11/Window Managers
-Group(de):	X11/Fenstermanager
-Group(es):	X11/Administraadores De Ventanas
-Group(fr):	X11/Gestionnaires De Fenêtres
-Group(pl):	X11/Zarz±dcy Okien
-Source0:	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
+# Source0-md5:	fa1b5f062cd2ba005eb555c358450deb
 Source1:	%{name}.desktop
 Source2:	%{name}.RunWM
 Source3:	%{name}.wm_style
+Source4:	%{name}-xsession.desktop
 Patch0:		%{name}-config-path.patch
 Patch1:		%{name}-makefile_fix.patch
-URL:		http://www.enlightenment.org/
-BuildRequires:	gtk+-devel >= 1.2.1
+Patch2:		%{name}-ac_am_fixes.patch
+Patch3:		%{name}-use_sys_snprintf.patch
+Patch4:		%{name}-pl.patch
+URL:		http://enlightenment.org/
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	esound-devel >= 0.2.13
-BuildRequires:	imlib-devel >= 1.9.8
-BuildRequires:	gettext-devel 
+BuildRequires:	fnlib-devel
 BuildRequires:	freetype1-devel
+BuildRequires:	gettext-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		_wmpropsdir	%{_datadir}/wm-properties
+%define		_wmpropsdir	/usr/share/wm-properties
+%define		_sysconfdir	/etc/X11/enlightenment
 
 %description
-Enlightenment is a Windowmanager for X-Windows that is designed to be
+Enlightenment is a Windowmanager for X Window 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 zarz±dc± okien
+jaki kiedykolwiek zosta³ stworzony dla Linuksa ;)
 
 %prep
 %setup  -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-gettextize --copy --force
+rm -f missing
+%{__libtoolize}
+%{__gettextize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 CFLAGS="-I%{_includedir}/freetype %{rpmcflags}"
 %configure \
-	--enable-fsstd \
-	--enable-sound
+	--enable-sound=yes
 
-%{__make} configdatadir=%{_sysconfdir}/X11/enlightenment
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_wmpropsdir},/etc/sysconfig/wmstyle}
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir},/etc/sysconfig/wmstyle}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	configdatadir=%{_sysconfdir}/X11/enlightenment
+	DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
 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
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
 
 %find_lang %{name}
 
@@ -77,12 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz
-%dir %{_sysconfdir}/X11/enlightenment
-%config %{_sysconfdir}/X11/enlightenment/*
+%doc AUTHORS README NEWS
+%config %{_sysconfdir}
 %attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 /etc/sysconfig/wmstyle/*.names
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/enlightenment
+%dir %{_datadir}/enlightenment
+%{_datadir}/enlightenment/[!s]*
+%attr(755,root,root) %{_datadir}/enlightenment/scripts
+%{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*
 %{_mandir}/man1/*