- updated to 0.16.8.1, not tested

- TODO: cp everything at cvs site

Changed files:
    enlightenment.spec -> 1.87

diff --git a/enlightenment.spec b/enlightenment.spec
index 0a1e6c1c62065da7f1e4c1ad9bb056abddec5ab9..ee0933ca963e669234b4fa79c129f771adbb9f25 100644 (file)
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,35 +1,34 @@
 Summary:       Enlightenment Window Manager
 Summary(pl):   Zarz±dca okien X - Enlightenment
 Summary(de):   Enlightenment ist ein Window Manager für X
-Name:          enlightenment
-Version:       0.16.7.2
-Release:       2
+Name:          e16
+Version:       0.16.8.1
+Release:       0.1
 License:       BSD
 Group:         X11/Window Managers
 Source0:       http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
-# Source0-md5: 78747d34f882676eafe26eef22a448be
+# Source0-md5: 0ff909ae575f805160676a853adff9a0
 Source1:       %{name}.desktop
 Source2:       %{name}-xsession.desktop
-Source4:       %{name}-e_gen_menu
-Source5:       %{name}-e_check_menu
+Source3:       %{name}-e_gen_menu
+Source4:       %{name}-e_check_menu
 Patch0:                %{name}-edirconf.patch
 Patch1:                %{name}-ac_am_fixes.patch
 Patch2:                %{name}-pl.patch
-Patch3:                %{name}-no_eng_config.patch
-Patch4:                %{name}-check_menus.patch
-Patch5:                %{name}-winter-i18n.patch
+Patch3:                %{name}-check_menus.patch
+Patch4:                %{name}-winter-i18n.patch
 URL:           http://enlightenment.org/
 BuildRequires: XFree86
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: esound-devel >= 0.2.13
+BuildRequires: esound-devel >= 0.2.17
 BuildRequires: fnlib-devel
 BuildRequires: freetype-devel
 BuildRequires: gettext-devel
 BuildRequires: giflib-devel
 BuildRequires: gtk+-devel >= 1.2.1
 BuildRequires: iconv
-BuildRequires: imlib2-devel
+BuildRequires: imlib2-devel >= 1.2.2
 BuildRequires: libghttp-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng >= 1.0.8
@@ -42,7 +41,7 @@ Requires:     xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _wmpropsdir     /usr/share/wm-properties
-%define                _sysconfdir     /etc/X11/enlightenment
+%define                _sysconfdir     /etc/X11/%{name}
 
 %description
 Enlightenment is a Windowmanager for X Window that is designed to be
@@ -64,32 +63,12 @@ und Dateien zu verwalten.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-# tar-gziped text files !?!
-( cd config
-for LANG_FILE in ja ko pl; do
-       mkdir $LANG_FILE
-       cd $LANG_FILE
-       tar -zxvf ../config.$LANG_FILE
-       cd ..
-done )
+#%%patch2 -p1  XXX: needs update
 %patch3 -p1
-%patch4 -p1
 mkdir themes/winter
-cd themes/winter
-tar -zxf ../winter.etheme
-cd -
-%patch5 -p1
-
-for FILE in actionclasses.cfg keybindings.cfg keybindings.gmc.cfg \
-               keybindings.nogmc.cfg menus.cfg; do
-       iconv -f EUC-JP -t UTF-8 config/ja/$FILE.ja > \
-               config/ja/$FILE.ja_JP.UTF-8
-       iconv -f EUC-KR -t UTF-8 config/ko/$FILE.ko > \
-               config/ko/$FILE.ko_KR.UTF-8
-       iconv -f ISO-8859-2 -t UTF-8 config/pl/$FILE.pl > \
-               config/pl/$FILE.pl_PL.UTF-8
-done   # it helps, but UTF-8 still isn't working correctly
+tar -C themes/winter -zxf themes/winter.etheme
+%patch4 -p1
+rm themes/winter/fonts.cfg.*
 
 mv -f po/{no,nb}.po
 rm po/*.gmo
@@ -119,10 +98,8 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir},/etc/sysconfig/w
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/enlightenment/scripts/e_gen_menu
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/enlightenment/scripts/e_check_menu
-
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/enlightenment/X11
+install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/e_gen_menu
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/e_check_menu
 
 %find_lang %{name}
 
@@ -134,9 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README NEWS
 %config %{_sysconfdir}
 %attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/enlightenment
-%{_datadir}/enlightenment/[!s]*
-%attr(755,root,root) %{_datadir}/enlightenment/scripts
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/[!s]*
+%dir %{_datadir}/%{name}/scripts
+%attr(755,root,root) %{_datadir}/%{name}/scripts/*
 %{_datadir}/xsessions/%{name}.desktop
 %{_wmpropsdir}/*
-%{_mandir}/man1/*