X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=elementary.spec;h=dc0c774c5cae712234ed9b7fd8c5d83148512a4c;hb=e8303b8660cbe1296b3c845d688eb3a1129f0f11;hp=a4ac6963aac94933f9cddef24a99bca052c6e0c4;hpb=429c96cb20baee40da7c396fc59d896106ea9707;p=packages%2Felementary.git

diff --git a/elementary.spec b/elementary.spec
index a4ac696..dc0c774 100644
--- a/elementary.spec
+++ b/elementary.spec
@@ -1,54 +1,56 @@
-#
-# TODO: - elementary_testql searches for modules in ../lib not _libdir
-#	- plugins in separate packages
+# TODO: (some) plugins in separate packages?
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
-%bcond_without	ewebkit		# Web (WebKit) support
+%bcond_without	fb		# Ecore FB support
+%bcond_without	sdl		# Ecore SDL support
+%bcond_with	wayland		# Ecore Wayland support
+%bcond_with	elocation	# Elocation support [not available yet in PLD]
+%bcond_with	emap		# Emap support [not available yet in PLD]
+%bcond_with	eweather	# Eweather support [not available yet in PLD]
+%bcond_with	ewebkit		# Web (WebKit) support
 #
 
-%define		ecore_ver	1.7.7
-%define		edbus_ver	1.7.7
-%define		edje_ver	1.7.7
-%define		eet_ver 	1.7.7
-%define		efreet_ver 	1.7.7
-%define		eina_ver	1.7.7
-%define		evas_ver	1.7.7
+%define		efl_ver		1.8.0
 
 Summary:	Basic widget set
 Summary(pl.UTF-8):	Zestaw prostych widżetów
 Name:		elementary
-Version:	1.7.7
+Version:	1.8.0
 Release:	1
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	311d46446778dcd9ee8939c504283c26
+Source0:	http://download.enlightenment.org/rel/libs/elementary/%{name}-%{version}.tar.bz2
+# Source0-md5:	6c3c4086320d8403a6752d70d8a7b023
 URL:		http://trac.enlightenment.org/e/wiki/Elementary
-BuildRequires:	e_dbus-devel >= %{edbus_ver}
-BuildRequires:	ecore-con-devel >= %{ecore_ver}
-BuildRequires:	ecore-devel >= %{ecore_ver}
-BuildRequires:	ecore-evas-devel >= %{ecore_ver}
-BuildRequires:	ecore-fb-devel >= %{ecore_ver}
-BuildRequires:	ecore-file-devel >= %{ecore_ver}
-BuildRequires:	ecore-imf-devel >= %{ecore_ver}
-BuildRequires:	ecore-sdl-devel >= %{ecore_ver}
-BuildRequires:	ecore-wayland-devel >= %{ecore_ver}
-BuildRequires:	ecore-x-devel >= %{ecore_ver}
-BuildRequires:	edje >= %{edje_ver}
-BuildRequires:	edje-devel >= %{edje_ver}
-BuildRequires:	eet-devel >= %{eet_ver}
-BuildRequires:	efreet-devel >= %{efreet_ver}
-BuildRequires:	eina-devel >= %{eina_ver}
-BuildRequires:	eio-devel
-BuildRequires:	emotion-devel
-BuildRequires:	ethumb-devel
-BuildRequires:	evas-devel >= %{evas_ver}
+BuildRequires:	ecore-con-devel >= %{efl_ver}
+BuildRequires:	ecore-devel >= %{efl_ver}
+BuildRequires:	ecore-evas-devel >= %{efl_ver}
+%{?with_fb:BuildRequires:	ecore-fb-devel >= %{efl_ver}}
+BuildRequires:	ecore-file-devel >= %{efl_ver}
+BuildRequires:	ecore-imf-devel >= %{efl_ver}
+BuildRequires:	ecore-input-devel >= %{efl_ver}
+%{?with_sdl:BuildRequires:	ecore-sdl-devel >= %{efl_ver}}
+%{?with_wayland:BuildRequires:	ecore-wayland-devel >= %{efl_ver}}
+BuildRequires:	ecore-x-devel >= %{efl_ver}
+BuildRequires:	edje >= %{efl_ver}
+BuildRequires:	edje-devel >= %{efl_ver}
+BuildRequires:	eet-devel >= %{efl_ver}
+BuildRequires:	efreet-devel >= %{efl_ver}
+BuildRequires:	eina-devel >= %{efl_ver}
+BuildRequires:	eio-devel >= %{efl_ver}
+BuildRequires:	eldbus-devel >= %{efl_ver}
+%{?with_elocation:BuildRequires:	elocation-devel >= 0.1.0}
+%{?with_emap:BuildRequires:	emap-devel}
+BuildRequires:	emotion-devel >= %{efl_ver}
+BuildRequires:	eo-devel >= %{efl_ver}
+BuildRequires:	ethumb-devel >= %{efl_ver}
+BuildRequires:	evas-devel >= %{efl_ver}
 BuildRequires:	evas-loader-jpeg >= %{evas_ver}
+%{?with_eweather:BuildRequires:	eweather-devel}
 %{?with_webkit:BuildRequires:	ewebkit-devel >= 0-0.r127150.1}
 BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	pkgconfig >= 1:0.22
-# TODO: eweather, emap
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -64,21 +66,30 @@ dla urządzeń mobilnych.
 Summary:	Elementary library
 Summary(pl.UTF-8):	Bilblioteka Elementary
 Group:		Libraries
-Requires:	e_dbus >= %{edbus_ver}
-Requires:	ecore >= %{ecore_ver}
-Requires:	ecore-con >= %{ecore_ver}
-Requires:	ecore-evas >= %{ecore_ver}
-Requires:	ecore-fb >= %{ecore_ver}
-Requires:	ecore-file >= %{ecore_ver}
-Requires:	ecore-imf >= %{ecore_ver}
-Requires:	ecore-sdl >= %{ecore_ver}
-Requires:	ecore-wayland >= %{ecore_ver}
-Requires:	ecore-x >= %{ecore_ver}
-Requires:	edje-libs >= %{edje_ver}
-Requires:	eet >= %{eet_ver}
-Requires:	efreet >= %{efreet_ver}
-Requires:	eina >= %{eina_ver}
-Requires:	evas >= %{evas_ver}
+Requires:	ecore-con >= %{efl_ver}
+Requires:	ecore >= %{efl_ver}
+Requires:	ecore-evas >= %{efl_ver}
+%{?with_fb:Requires:	ecore-fb >= %{efl_ver}}
+Requires:	ecore-file >= %{efl_ver}
+Requires:	ecore-imf >= %{efl_ver}
+Requires:	ecore-input >= %{efl_ver}
+%{?with_sdl:Requires:	ecore-sdl >= %{efl_ver}}
+%{?with_wayland:Requires:	ecore-wayland >= %{efl_ver}}
+Requires:	ecore-x >= %{efl_ver}
+Requires:	edje-libs >= %{efl_ver}
+Requires:	eet >= %{efl_ver}
+Requires:	efreet-libs >= %{efl_ver}
+Requires:	eina >= %{efl_ver}
+Requires:	eio >= %{efl_ver}
+Requires:	eldbus >= %{efl_ver}
+%{?with_elocation:Requires:	elocation >= 0.1.0}
+%{?with_emap:Requires:	emap}
+Requires:	emotion >= %{efl_ver}
+Requires:	eo >= %{efl_ver}
+Requires:	ethumb-libs >= %{efl_ver}
+Requires:	evas >= %{efl_ver}
+%{?with_eweather:Requires:	eweather}
+%{?with_webkit:Requires:	ewebkit >= 0-0.r127150.1}
 
 %description libs
 Elementary library files.
@@ -91,18 +102,31 @@ Summary:	Elementary header files
 Summary(pl.UTF-8):	Pliki nagłówkowe Elementary
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	ecore-con-devel >= %{ecore_ver}
-Requires:	ecore-devel >= %{ecore_ver}
-Requires:	ecore-evas-devel >= %{ecore_ver}
-Requires:	ecore-file-devel >= %{ecore_ver}
-Requires:	ecore-imf-devel >= %{ecore_ver}
-Requires:	ecore-sdl-devel >= %{ecore_ver}
-Requires:	ecore-wayland-devel >= %{ecore_ver}
-Requires:	ecore-x-devel >= %{ecore_ver}
-Requires:	edje-devel >= %{edje_ver}
-Requires:	eet-devel >= %{eet_ver}
-Requires:	eina-devel >= %{eina_ver}
-Requires:	evas-devel >= %{evas_ver}
+Requires:	ecore-con-devel >= %{efl_ver}
+Requires:	ecore-devel >= %{efl_ver}
+Requires:	ecore-evas-devel >= %{efl_ver}
+%{?with_fb:Requires:	ecore-fb-devel >= %{efl_ver}}
+Requires:	ecore-file-devel >= %{efl_ver}
+Requires:	ecore-imf-devel >= %{efl_ver}
+Requires:	ecore-input-devel >= %{efl_ver}
+%{?with_sdl:Requires:	ecore-sdl-devel >= %{efl_ver}}
+%{?with_wayland:Requires:	ecore-wayland-devel >= %{efl_ver}}
+Requires:	ecore-x-devel >= %{efl_ver}
+Requires:	edje-devel >= %{efl_ver}
+Requires:	eet-devel >= %{efl_ver}
+Requires:	efreet-devel >= %{efl_ver}
+Requires:	eina-devel >= %{efl_ver}
+Requires:	eio-devel >= %{efl_ver}
+Requires:	eldbus-devel >= %{efl_ver}
+%{?with_elocation:Requires:	elocation-devel >= 0.1.0}
+%{?with_emap:Requires:	emap-devel}
+Requires:	emotion-devel >= %{efl_ver}
+Requires:	eo-devel >= %{efl_ver}
+Requires:	ethumb-devel >= %{efl_ver}
+Requires:	evas-devel >= %{efl_ver}
+Requires:	evas-loader-jpeg >= %{evas_ver}
+%{?with_eweather:Requires:	eweather-devel}
+%{?with_webkit:Requires:	ewebkit-devel >= 0-0.r127150.1}
 
 %description devel
 Header files for Elementary.
@@ -127,6 +151,16 @@ Statyczna biblioteka Elementary.
 
 %build
 %configure \
+	--disable-ecore-cocoa \
+	%{!?with_fb:--disable-ecore-fb} \
+	--disable-ecore-psl1ght \
+	%{!?with_sdl:--disable-ecore-sdl} \
+	%{!?with_wayland:--disable-ecore-wayland} \
+	--disable-ecore-win32 \
+	--disable-ecore-wince \
+	%{!?with_elocation:--disable-elocation} \
+	%{!?with_emap:--disable-emap} \
+	%{!?with_eweather:--disable-eweather} \
 	--disable-silent-rules \
 	%{!?with_ewebkit:--disable-web} \
 	%{?with_static_libs:--enable-static}
@@ -144,8 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/edje/modules/elm/linux-gnu-*/*.la \
 	$RPM_BUILD_ROOT%{_libdir}/elementary/modules/*/linux-gnu-*/*.la
 
-mv $RPM_BUILD_ROOT%{_localedir}/az{_IR,}
 mv $RPM_BUILD_ROOT%{_localedir}/ko{_KR,}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libelementary.la
 
 %find_lang %{name}
 
@@ -162,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/elementary_quicklaunch
 %attr(755,root,root) %{_bindir}/elementary_run
 %attr(755,root,root) %{_bindir}/elementary_test
-%attr(755,root,root) %{_bindir}/elementary_testql
+%attr(755,root,root) %{_bindir}/elm_prefs_cc
 %{_desktopdir}/elementary_config.desktop
 %{_desktopdir}/elementary_test.desktop
 %{_datadir}/elementary
@@ -172,7 +207,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libelementary.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libelementary.so.1
-%attr(755,root,root) %{_libdir}/elementary_testql.so
 %dir %{_libdir}/edje/modules/elm
 %dir %{_libdir}/edje/modules/elm/linux-gnu-*
 %attr(755,root,root) %{_libdir}/edje/modules/elm/linux-gnu-*/module.so
@@ -184,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/elementary/modules/datetime_input_ctxpopup
 %dir %{_libdir}/elementary/modules/datetime_input_ctxpopup/linux-gnu-*
 %attr(755,root,root) %{_libdir}/elementary/modules/datetime_input_ctxpopup/linux-gnu-*/module.so
+%dir %{_libdir}/elementary/modules/prefs
+%dir %{_libdir}/elementary/modules/prefs/linux-gnu-*
+%attr(755,root,root) %{_libdir}/elementary/modules/prefs/linux-gnu-*/module.so
+%{_libdir}/elementary/modules/prefs/linux-gnu-*/elm_prefs_swallow.edj
 %dir %{_libdir}/elementary/modules/test_entry
 %dir %{_libdir}/elementary/modules/test_entry/linux-gnu-*
 %attr(755,root,root) %{_libdir}/elementary/modules/test_entry/linux-gnu-*/module.so
@@ -193,15 +231,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/elementary_codegen
 %attr(755,root,root) %{_libdir}/libelementary.so
-%{_libdir}/libelementary.la
-%{_libdir}/elementary_testql.la
 %{_includedir}/elementary-1
 %{_pkgconfigdir}/elementary.pc
+%{_libdir}/cmake/Elementary
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libelementary.a
-%{_libdir}/elementary_testql.a
 %endif