- merged enlightenmentDR17.spec

Changed files:
    enlightenment.spec -> 1.88

diff --git a/enlightenment.spec b/enlightenment.spec
index ee0933ca963e669234b4fa79c129f771adbb9f25..b153403007cd6495d47dd88a4a1ce3730e4c639d 100644 (file)
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,47 +1,35 @@
 Summary:       Enlightenment Window Manager
 Summary(pl):   Zarz±dca okien X - Enlightenment
-Summary(de):   Enlightenment ist ein Window Manager für X
-Name:          e16
-Version:       0.16.8.1
-Release:       0.1
+Name:          enlightenment
+Version:       0.16.999.030
+Release:       1
 License:       BSD
 Group:         X11/Window Managers
-Source0:       http://dl.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
-# Source0-md5: 0ff909ae575f805160676a853adff9a0
-Source1:       %{name}.desktop
-Source2:       %{name}-xsession.desktop
-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}-check_menus.patch
-Patch4:                %{name}-winter-i18n.patch
+Source0:       http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
+# Source0-md5: 16724991638d19d5a67b9d9273b584c9
+Source1:       %{name}-xsession.desktop
+Source2:       enlightenmentDR17-app.tar.gz
+# Source2-md5: 9f08a7d1850bc81eb301d849561f609f
+Source3:       enlightenmentDR17-wcnt.txt
+Patch0:                enlightenmentDR17-module_temp_mac.patch
 URL:           http://enlightenment.org/
-BuildRequires: XFree86
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: esound-devel >= 0.2.17
-BuildRequires: fnlib-devel
-BuildRequires: freetype-devel
+BuildRequires: edje
+BuildRequires: edje-devel
 BuildRequires: gettext-devel
-BuildRequires: giflib-devel
-BuildRequires: gtk+-devel >= 1.2.1
-BuildRequires: iconv
-BuildRequires: imlib2-devel >= 1.2.2
-BuildRequires: libghttp-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng >= 1.0.8
-BuildRequires: libtiff-devel
 BuildRequires: libtool
-BuildRequires: zlib-devel
-Requires:      ImageMagick-coder-png
+BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
+Requires:      fonts-TTF-bitstream-vera
 Requires:      vfmg >= 0.9.95
-Requires:      xinitrc-ng
+Requires:      enlightenment-theme-default = %{version}
+Requires:      enlightenment-init-default
+Obsoletes:     enlightenmentDR17 >= 0.16.999
+Obsoletes:     enlightenmentDR17-libs >= 0.16.999
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _wmpropsdir     /usr/share/wm-properties
-%define                _sysconfdir     /etc/X11/%{name}
+%undefine      __cxx
 
 %description
 Enlightenment is a Windowmanager for X Window that is designed to be
@@ -51,55 +39,79 @@ powerful, extensible, configurable and able to be really good looking.
 Enlightenment jest najpotê¿niejszym i najpiêkniejszym zarz±dc± okien
 jaki kiedykolwiek zosta³ stworzony dla Linuksa ;)
 
-%description -l de
-Enlightenment ist ein Window Manager für X. Sein Designziel ist es, so
-konfigurierbar wie nur möglich in den Bereichen Aussehen und Bedienung
-zu sein. Das derzeitige Design von Enlightenment steuert darauf hin,
-ein "vernünftiger" Desktop zu werden, das bedeutet, es verwaltet
-Anwendungsfenster, zudem wird in der Lage sein, Anwendungen zu starten
-und Dateien zu verwalten.
+%package module-cpufreq-freqset
+Summary:       CPU speed management binary
+Summary(pl):   Program do zaz±dzania szybko¶ci± CPU
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Obsoletes:     enlightenmentDR17-module-cpufreq-freqset >= 0.16.999
+
+%description module-cpufreq-freqset
+freqset makes you able to change CPU frequency using cpufreq module.
+
+It contains SUID binary.
+
+%description module-cpufreq-freqset -l pl
+freqset pozwala zmieniaæ czêstotliwo¶æ pracy procesora przy u¿yciu
+modu³u cpufreq.
+
+Zawiera binarkê SUID.
+
+%package devel
+Summary:       Development headers for Enlightenment
+Summary(pl):   Pliki nag³ówkowe dla Enlightenmenta
+Group:         Development/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      edje-devel
+Obsoletes:     enlightenmentDR17-devel >= 0.16.999
+
+%description devel
+Development headers for Enlightenment.
+
+%description devel -l pl
+Pliki nag³ówkowe dla Enlightenmenta.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-#%%patch2 -p1  XXX: needs update
-%patch3 -p1
-mkdir themes/winter
-tar -C themes/winter -zxf themes/winter.etheme
-%patch4 -p1
-rm themes/winter/fonts.cfg.*
-
-mv -f po/{no,nb}.po
-rm po/*.gmo
+install %{SOURCE2} data/other/applications.tar.gz
 
 %build
-rm -f missing
 %{__libtoolize}
-%{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export LOCALEDIR=%{_datadir}/locale
 %configure \
-       --enable-sound=yes
-
-# regenerate gmo files
-%{__make} -C po update-gmo
+       --disable-static \
+       --disable-valgrind      \
+       --with-profile=SLOW_PC
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,%{_wmpropsdir},/etc/sysconfig/wmstyle}
+install -d $RPM_BUILD_ROOT%{_datadir}/xsessions
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_wmpropsdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/e_gen_menu
-install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/e_check_menu
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/init/init.edj
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/themes/default.edj
+
+install -d $RPM_BUILD_ROOT%{_libdir}/enlightenment/modules_extra
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/config-apps
+install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop
+install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/wcnt.txt
+find $RPM_BUILD_ROOT%{_libdir}/enlightenment -name "*.a" -or -name "*.la" \
+       | xargs rm
+
+cd $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts
+VERA=$(ls Vera*.ttf)
+for FONT in $VERA; do
+       rm -f $FONT
+       ln -s %{_fontsdir}/TTF/$FONT .
+done
+cd -
 
 %find_lang %{name}
 
@@ -108,12 +120,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS README NEWS
-%config %{_sysconfdir}
-%attr(755,root,root) %{_bindir}/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/[!s]*
-%dir %{_datadir}/%{name}/scripts
-%attr(755,root,root) %{_datadir}/%{name}/scripts/*
+%doc AUTHORS COPYING* README
+%attr(755,root,root) %{_bindir}/enlightenment
+%attr(755,root,root) %{_bindir}/enlightenment_eapp
+%attr(755,root,root) %{_bindir}/enlightenment_eapp_cache_gen
+%attr(755,root,root) %{_bindir}/enlightenment_imc
+%attr(755,root,root) %{_bindir}/enlightenment_remote
+%attr(755,root,root) %{_bindir}/enlightenment_start
+%attr(755,root,root) %{_bindir}/enlightenment_thumb
+%dir %{_libdir}/enlightenment
+%dir %{_libdir}/enlightenment/*
+%dir %{_libdir}/enlightenment/modules/*
+%dir %{_libdir}/enlightenment/modules/*/linux-gnu-*
+%attr(755,root,root) %{_libdir}/enlightenment/modules/*/linux-gnu-*/*.so
+# violates FHS
+%{_libdir}/enlightenment/modules/*/module.eap
+%{_datadir}/%{name}
 %{_datadir}/xsessions/%{name}.desktop
-%{_wmpropsdir}/*
+
+%files module-cpufreq-freqset
+%defattr(644,root,root,755)
+# what group should it be ?
+%attr(4754,root,sys) %{_libdir}/enlightenment/modules/cpufreq/linux-gnu-*/freqset
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/enlightenment-config
+%dir %{_includedir}/enlightenment
+%{_includedir}/enlightenment/*.h