- update to 0.16.7.1 & vfmg support by Przemyslaw Iskra

Changed files:
    e16.spec -> 1.78

diff --git a/e16.spec b/e16.spec
index f5fd2041e5758f13f89009d26b836d93f95a8de9..f47b21885a46a88e040eb416c3d3818c43733c88 100644 (file)
--- a/e16.spec
+++ b/e16.spec
@@ -1,35 +1,36 @@
 # 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):   Zarz±dca okien X - Enlightenment
 Name:          enlightenment
-Version:       0.16.6
-Release:       4
+Version:       0.16.7.1
+Release:       1
 License:       GPL
 Group:         X11/Window Managers
 Source0:       http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
-# Source0-md5: fa1b5f062cd2ba005eb555c358450deb
+# Source0-md5: 1439839c3023914a62f8254cc31085fc
+# Source0-size:        1791137
 Source1:       %{name}.desktop
-Source4:       %{name}-xsession.desktop
-Patch0:                %{name}-config-path.patch
-Patch1:                %{name}-makefile_fix.patch
-Patch2:                %{name}-ac_am_fixes.patch
-Patch3:                %{name}-use_sys_snprintf.patch
-Patch4:                %{name}-pl.patch
-Patch5:                %{name}-locale_names.patch
+Source2:       %{name}-xsession.desktop
+Source3:       %{name}-winter.etheme.i18n
+Source4:       %{name}-e_gen_menu
+Source5:       %{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
 URL:           http://enlightenment.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: esound-devel >= 0.2.13
 BuildRequires: fnlib-devel
-BuildRequires: freetype1-devel
+BuildRequires: freetype-devel
 BuildRequires: gettext-devel
 BuildRequires: gtk+-devel >= 1.2.1
-BuildRequires: imlib-devel >= 1.9.8
+BuildRequires: iconv
+BuildRequires: imlib2-devel
 BuildRequires: libghttp-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng >= 1.0.8
@@ -37,6 +38,8 @@ BuildRequires:        libtiff-devel
 BuildRequires: libtool
 BuildRequires: libungif-devel
 BuildRequires: zlib-devel
+BuildRequires: XFree86
+Requires:      vfmg >= 0.9.18-4
 Requires:      xinitrc-ng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,12 +59,30 @@ jaki kiedykolwiek zosta
 %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 )
 %patch3 -p1
 %patch4 -p1
-%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
 
-mv -f po/{dk,da}.po
 mv -f po/{no,nb}.po
+rm po/*.gmo
+
+cp %{SOURCE3} themes/winter.etheme.i18n
 
 %build
 rm -f missing
@@ -69,11 +90,14 @@ rm -f missing
 %{__gettextize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-CFLAGS="-I%{_includedir}/freetype %{rpmcflags}"
+export LOCALEDIR=%{_datadir}/locale
 %configure \
        --enable-sound=yes
 
+# regenerate gmo files
+%{__make} dist
 %{__make}
 
 %install
@@ -84,7 +108,11 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir},/etc/sysconfig/w
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+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
 
 %find_lang %{name}