- updated to 1.8.5

[packages/efl.git] / efl.spec

diff --git a/efl.spec b/efl.spec
index 5ca234d06157c60e0cec253777f2774d4e7393e0..32dcb6b15f7eadad68c400c2b97acc484bddce47 100644 (file)
--- a/efl.spec
+++ b/efl.spec
@@ -1,5 +1,5 @@
 # TODO:
-# - gesture (libXgesture, gesture.h)
+# - gesture (libXgesture, gesture.h) - tizen-specific? http://download.tizen.org/releases/2.2.1/latest/repos/tizen-main/source/
 # - use system liblinebreak?
 # - eio-devel conflicts with libeio-devel
 #      file /usr/lib64/libeio.so from install of eio-devel-0.1.0.65643-1.x86_64 conflicts with file from package libeio-devel-1.0-1.x86_64
@@ -24,13 +24,14 @@
 Summary:       EFL - The Enlightenment Foundation Libraries
 Summary(pl.UTF-8):     EFL (Enlightenment Foundation Libraries) - biblioteki tworzące Enlightment
 Name:          efl
-Version:       1.8.1
+Version:       1.8.5
 Release:       1
 License:       LGPL v2.1+, BSD
 Group:         Libraries
 Source0:       http://download.enlightenment.org/rel/libs/efl/%{name}-%{version}.tar.bz2
-# Source0-md5: 2289689fb6439eec251156f10ee0a203
+# Source0-md5: c05921fd686aef11045770b65ed0d72e
 Patch0:                %{name}-pc.patch
+Patch1:                %{name}-wayland.patch
 URL:           https://trac.enlightenment.org/e/wiki/EFL
 %{?with_egl:BuildRequires:     EGL-devel}
 BuildRequires: OpenGL-GLX-devel
@@ -70,7 +71,7 @@ BuildRequires:        pixman-devel
 BuildRequires: pkgconfig >= 1:0.22
 BuildRequires: pulseaudio-devel
 %{?with_scim:BuildRequires:    scim-devel}
-%{?with_systemd:BuildRequires: systemd-devel >= 192}
+%{?with_systemd:BuildRequires: systemd-devel >= 1:192}
 BuildRequires: tslib-devel
 %{?with_xine:BuildRequires:    xine-lib-devel >= 2:1.1.1}
 BuildRequires: zlib-devel >= 1.2.3
@@ -121,6 +122,7 @@ Group:              Libraries
 URL:           http://trac.enlightenment.org/e/wiki/Ecore
 Requires:      eina = %{version}-%{release}
 Requires:      eo = %{version}-%{release}
+%{?with_systemd:Requires:      systemd-libs >= 1:192}
 Obsoletes:     ecore-config
 Obsoletes:     ecore-config-devel
 Obsoletes:     ecore-config-static
@@ -155,6 +157,7 @@ Requires:   ecore = %{version}-%{release}
 Requires:      eina-devel = %{version}-%{release}
 Requires:      eo-devel = %{version}-%{release}
 Requires:      glib2-devel >= 2.0
+%{?with_systemd:Requires:      systemd-devel >= 1:192}
 
 %description -n ecore-devel
 Header files for Ecore library.
@@ -313,16 +316,6 @@ Requires:  ecore = %{version}-%{release}
 Requires:      ecore-input = %{version}-%{release}
 Requires:      ecore-input-evas = %{version}-%{release}
 Requires:      evas = %{version}-%{release}
-# for individual modules now
-##Requires:    ecore-fb = %{version}-%{release}
-##Requires:    ecore-ipc = %{version}-%{release}
-##Requires:    ecore-sdl = %{version}-%{release}
-%if %{with wayland}
-##Requires:    ecore-wayland = %{version}-%{release}
-#Requires:     Mesa-libwayland-egl >= 9.2.0
-#Requires:     Mesa-libEGL >= 7.10
-%endif
-##Requires:    ecore-x = %{version}-%{release}
 
 %description -n ecore-evas
 Ecore Evas library.
@@ -631,6 +624,22 @@ Ecore IMF SCIM input method module.
 %description -n ecore-imf-module-scim -l pl.UTF-8
 Ecore IMF - moduł metody wprowadzania znaków SCIM.
 
+%package -n ecore-imf-module-wayland
+Summary:       Ecore IMF Wayland input method module
+Summary(pl.UTF-8):     Ecore IMF - moduł metody wprowadzania znaków Wayland
+License:       BSD
+Group:         Libraries
+URL:           http://trac.enlightenment.org/e/wiki/Ecore
+Requires:      ecore-evas = %{version}-%{release}
+Requires:      ecore-imf = %{version}-%{release}
+Requires:      ecore-wayland = %{version}-%{release}
+
+%description -n ecore-imf-module-wayland
+Ecore IMF Wayland input method module.
+
+%description -n ecore-imf-module-wayland -l pl.UTF-8
+Ecore IMF - moduł metody wprowadzania znaków Wayland.
+
 %package -n ecore-imf-module-xim
 Summary:       Ecore IMF XIM input method module
 Summary(pl.UTF-8):     Ecore IMF - moduł metody wprowadzania znaków XIM
@@ -875,6 +884,7 @@ Group:              Libraries
 Requires:      ecore = %{version}-%{release}
 Requires:      ecore-input = %{version}-%{release}
 Requires:      wayland >= 1.3.0
+Requires:      xorg-lib-libxkbcommon >= 0.3.0
 
 %description -n ecore-wayland
 Ecore Wayland library.
@@ -889,6 +899,7 @@ Group:              Development/Libraries
 Requires:      ecore-devel = %{version}-%{release}
 Requires:      ecore-input-devel = %{version}-%{release}
 Requires:      wayland-devel >= 1.3.0
+Requires:      xorg-lib-libxkbcommon-devel >= 0.3.0
 
 %description -n ecore-wayland-devel
 Header file for Ecore Wayland library.
@@ -1334,6 +1345,7 @@ Summary(pl.UTF-8):        Biblioteka struktur danych (lista, hasz, itp.)
 License:       LGPL v2.1+
 Group:         Libraries
 URL:           http://trac.enlightenment.org/e/wiki/Eina
+%{?with_systemd:Requires:      systemd-libs >= 1:192}
 
 %description -n eina
 Data types library (list, hash, etc.)
@@ -1348,6 +1360,7 @@ License:  LGPL v2.1+
 Group:         Development/Libraries
 URL:           http://trac.enlightenment.org/e/wiki/Eina
 Requires:      eina = %{version}-%{release}
+%{?with_systemd:Requires:      systemd-devel >= 1:192}
 
 %description -n eina-devel
 Header files for Eina.
@@ -1947,6 +1960,8 @@ Summary(pl.UTF-8):        Moduł silnika renderującego Wayland EGL dla Evas
 License:       BSD
 Group:         Libraries
 URL:           http://trac.enlightenment.org/e/wiki/Evas
+Requires:      Mesa-libEGL-devel >= 7.10
+Requires:      Mesa-libwayland-egl-devel >= 9.2.0
 Requires:      evas = %{version}-%{release}
 
 %description -n evas-engine-wayland_egl
@@ -2129,6 +2144,7 @@ Obsługa składni EDC dla Vima.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -2168,7 +2184,7 @@ Obsługa składni EDC dla Vima.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles
@@ -2450,7 +2466,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ecore_imf/modules
 %{_datadir}/ecore_imf
 
-
 %files -n ecore-imf-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libecore_imf.so
@@ -2479,6 +2494,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/ecore_imf/modules/scim/linux-gnu-*/module.so
 %endif
 
+%if %{with wayland}
+%files -n ecore-imf-module-wayland
+%defattr(644,root,root,755)
+%dir %{_libdir}/ecore_imf/modules/wayland
+%dir %{_libdir}/ecore_imf/modules/wayland/linux-gnu-*
+%attr(755,root,root) %{_libdir}/ecore_imf/modules/wayland/linux-gnu-*/module.so
+%endif
+
 %if %{without xcb_api}
 %files -n ecore-imf-module-xim
 %defattr(644,root,root,755)