From: Jongmin Lee Date: Tue, 11 Dec 2018 10:13:58 +0000 (+0900) Subject: efl: update spec examples for efl and/or elementary optional build X-Git-Tag: submit/tizen/20181218.080725~83 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=377693eb0b511eb01ab0088e2419c5faf437c762;p=platform%2Fupstream%2Fefl.git efl: update spec examples for efl and/or elementary optional build @tizen_fix Change-Id: Ia93debddcb6cd90430c6c6d8153b35d9897e6019 --- diff --git a/packaging/efl-with-elm.spec.example b/packaging/efl-with-elm.spec.example index 20c9723..07b6695 100644 --- a/packaging/efl-with-elm.spec.example +++ b/packaging/efl-with-elm.spec.example @@ -2,7 +2,7 @@ %bcond_with x Name: efl -Version: 1.20.0 +Version: 1.21.0 Release: 0 License: LGPL-2.1+ Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17 @@ -61,6 +61,7 @@ BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(ibus-1.0) %endif +#BuildRequires: pkgconfig(lottie-player) BuildRequires: glib2-devel #BuildRequires: pkgconfig(bullet) BuildRequires: pkgconfig(openssl) @@ -1193,7 +1194,6 @@ export XDG_RUNTIME_DIR="/tmp/" --with-glib=always \ --disable-xim \ --disable-scim \ - --disable-neon \ --disable-wayland-text-input \ --disable-gesture \ --with-tests=none \ @@ -1230,14 +1230,16 @@ export XDG_RUNTIME_DIR="/tmp/" --disable-libraw \ --disable-systemd \ --disable-cserve \ + --enable-tizenaudio \ --with-elementary-base-dir="share/.elementary" \ - --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \ + ac_cv_func_getuid=no # --enable-systemd \ # --enable-drm \ # --enable-gl-drm \ -%__make %{?_smp_mflags} --trace \ -2>&1 | sed \ +%__make %{?_smp_mflags} 2>&1 | \ +sed \ -e 's%^.*: error: .*$%\x1b[37;41m&\x1b[m%' \ -e 's%^.*: warning: .*$%\x1b[30;43m&\x1b[m%' @@ -1324,8 +1326,8 @@ ldconfig -l %{_libdir}/libelementary.so.1.99.100 %preun -n elementary-tizen rm -f %{_libdir}/libelementary.so.1 -#ln -sf %{_libdir}/libelementary.so.1.20.* %{_libdir}/libelementary.so.1 -ldconfig -l %{_libdir}/libelementary.so.1.20.* +#ln -sf %{_libdir}/libelementary.so.1.21.* %{_libdir}/libelementary.so.1 +ldconfig -l %{_libdir}/libelementary.so.1.21.* %postun -n elementary-tizen -p /sbin/ldconfig @@ -1351,6 +1353,7 @@ ldconfig -l %{_libdir}/libelementary.so.1.20.* %{_libdir}/libefl.so %{_libdir}/pkgconfig/efl*.pc %exclude %{_includedir}/efl-cxx-1/*.hh +%exclude %{_includedir}/efl-cxx-1/cxx/*.hh %files -n eina %manifest %{name}.manifest @@ -1568,8 +1571,8 @@ ldconfig -l %{_libdir}/libelementary.so.1.20.* %license licenses/COPYING.BSD %{_libdir}/libecore_con.so.* %{_tmpfilesdir}/efl.conf -%exclude %{_libdir}/ecore_con/utils/v-1.20/efl_net_proxy_helper -%exclude /usr/lib/debug/%{_libdir}/ecore_con/utils/v-1.20/efl_net_proxy_helper* +%exclude %{_libdir}/ecore_con/utils/v-1.21/efl_net_proxy_helper +%exclude /usr/lib/debug/%{_libdir}/ecore_con/utils/v-1.21/efl_net_proxy_helper* %files -n ecore-con-devel %manifest %{name}.manifest @@ -1718,6 +1721,8 @@ ldconfig -l %{_libdir}/libelementary.so.1.20.* %defattr(-,root,root,-) %license licenses/COPYING.BSD %{_libdir}/libecore_wl2.so.* +%{_libdir}/ecore_wl2/engines/*/*/module.so +%exclude /usr/lib/debug/%{_libdir}/ecore_wl2/engines/*/*/module.so.debug %files -n ecore-wl2-devel %manifest %{name}.manifest @@ -2041,11 +2046,11 @@ ldconfig -l %{_libdir}/libelementary.so.1.20.* %license COPYING %{_bindir}/elementary_quicklaunch %{_bindir}/elementary_run -%{_libdir}/edje/modules/elm/v-1.20/module.so +%{_libdir}/edje/modules/elm/v-1.21/module.so %{_libdir}/libelementary.so.1 -%{_libdir}/libelementary.so.1.20.* +%{_libdir}/libelementary.so.1.21.* %{_datadir}/elementary/edje_externals/* -%{_datadir}/icons/elementary.png +%{_datadir}/icons/hicolor/128x128/apps/elementary.png %{_libdir}/elementary/modules/ /usr/lib/debug/%{_libdir}/elementary/modules/ %exclude %{_datadir}/elementary/config/ diff --git a/packaging/efl-without-elm.spec.example b/packaging/efl-without-elm.spec.example index 98762f4..55a7f27 100644 --- a/packaging/efl-without-elm.spec.example +++ b/packaging/efl-without-elm.spec.example @@ -2,7 +2,7 @@ %bcond_with x Name: efl -Version: 1.20.0 +Version: 1.21.0 Release: 0 License: LGPL-2.1+ Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17 @@ -61,6 +61,7 @@ BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(ibus-1.0) %endif +#BuildRequires: pkgconfig(lottie-player) BuildRequires: glib2-devel #BuildRequires: pkgconfig(bullet) BuildRequires: pkgconfig(openssl) @@ -1161,7 +1162,6 @@ export XDG_RUNTIME_DIR="/tmp/" --with-glib=always \ --disable-xim \ --disable-scim \ - --disable-neon \ --disable-wayland-text-input \ --disable-gesture \ --with-tests=none \ @@ -1198,15 +1198,17 @@ export XDG_RUNTIME_DIR="/tmp/" --disable-libraw \ --disable-systemd \ --disable-cserve \ + --enable-tizenaudio \ --with-elementary-base-dir="share/.elementary" \ --with-elementary=efl \ - --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \ + ac_cv_func_getuid=no # --enable-systemd \ # --enable-drm \ # --enable-gl-drm \ -%__make %{?_smp_mflags} --trace \ -2>&1 | sed \ +%__make %{?_smp_mflags} 2>&1 | \ +sed \ -e 's%^.*: error: .*$%\x1b[37;41m&\x1b[m%' \ -e 's%^.*: warning: .*$%\x1b[30;43m&\x1b[m%' @@ -1305,6 +1307,7 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/efl.conf %{_libdir}/libefl.so %{_libdir}/pkgconfig/efl*.pc %exclude %{_includedir}/efl-cxx-1/*.hh +%exclude %{_includedir}/efl-cxx-1/cxx/*.hh %files -n eina %manifest %{name}.manifest @@ -1522,8 +1525,8 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/efl.conf %license licenses/COPYING.BSD %{_libdir}/libecore_con.so.* %{_tmpfilesdir}/efl.conf -%exclude %{_libdir}/ecore_con/utils/v-1.20/efl_net_proxy_helper -%exclude /usr/lib/debug/%{_libdir}/ecore_con/utils/v-1.20/efl_net_proxy_helper* +%exclude %{_libdir}/ecore_con/utils/v-1.21/efl_net_proxy_helper +%exclude /usr/lib/debug/%{_libdir}/ecore_con/utils/v-1.21/efl_net_proxy_helper* %files -n ecore-con-devel %manifest %{name}.manifest @@ -1672,6 +1675,8 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/efl.conf %defattr(-,root,root,-) %license licenses/COPYING.BSD %{_libdir}/libecore_wl2.so.* +%{_libdir}/ecore_wl2/engines/*/*/module.so +%exclude /usr/lib/debug/%{_libdir}/ecore_wl2/engines/*/*/module.so.debug %files -n ecore-wl2-devel %manifest %{name}.manifest @@ -1993,3 +1998,4 @@ install -m 0644 %SOURCE100 %{buildroot}%{_tmpfilesdir}/efl.conf ##%license COPYING ##%defattr(-,root,root,-) + diff --git a/packaging/elm-only.spec.example b/packaging/elm-only.spec.example index d541c9a..a23bbd6 100644 --- a/packaging/elm-only.spec.example +++ b/packaging/elm-only.spec.example @@ -2,7 +2,7 @@ %bcond_with x Name: elementary -Version: 1.20.0 +Version: 1.21.0 Release: 0 License: LGPL-2.1+ Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17 @@ -89,6 +89,7 @@ BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(ibus-1.0) %endif +#BuildRequires: pkgconfig(lottie-player) BuildRequires: glib2-devel #BuildRequires: pkgconfig(bullet) BuildRequires: pkgconfig(openssl) @@ -238,7 +239,6 @@ export XDG_RUNTIME_DIR="/tmp/" --with-glib=always \ --disable-xim \ --disable-scim \ - --disable-neon \ --disable-wayland-text-input \ --disable-gesture \ --with-tests=none \ @@ -275,19 +275,21 @@ export XDG_RUNTIME_DIR="/tmp/" --disable-libraw \ --disable-systemd \ --disable-cserve \ + --enable-tizenaudio \ --with-elementary-base-dir="share/.elementary" \ --with-elementary=elm \ --with-eolian-gen=/usr/bin/eolian_gen \ --with-elua=/usr/bin/elua \ --with-edje-cc=/usr/bin/edje_cc \ --with-eet-eet=/usr/bin/eet \ - --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb + --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \ + ac_cv_func_getuid=no # --enable-systemd \ # --enable-drm \ # --enable-gl-drm \ -%__make %{?_smp_mflags} --trace \ -2>&1 | sed \ +%__make %{?_smp_mflags} 2>&1 | \ +sed \ -e 's%^.*: error: .*$%\x1b[37;41m&\x1b[m%' \ -e 's%^.*: warning: .*$%\x1b[30;43m&\x1b[m%' @@ -311,8 +313,8 @@ ldconfig -l %{_libdir}/libelementary.so.1.99.100 %preun -n elementary-tizen rm -f %{_libdir}/libelementary.so.1 -#ln -sf %{_libdir}/libelementary.so.1.20.* %{_libdir}/libelementary.so.1 -ldconfig -l %{_libdir}/libelementary.so.1.20.* +#ln -sf %{_libdir}/libelementary.so.1.21.* %{_libdir}/libelementary.so.1 +ldconfig -l %{_libdir}/libelementary.so.1.21.* %postun -n elementary-tizen -p /sbin/ldconfig @@ -323,11 +325,11 @@ ldconfig -l %{_libdir}/libelementary.so.1.20.* %license COPYING %{_bindir}/elementary_quicklaunch %{_bindir}/elementary_run -%{_libdir}/edje/modules/elm/v-1.20/module.so +%{_libdir}/edje/modules/elm/v-1.21/module.so %{_libdir}/libelementary.so.1 -%{_libdir}/libelementary.so.1.20.* +%{_libdir}/libelementary.so.1.21.* %{_datadir}/elementary/edje_externals/* -%{_datadir}/icons/elementary.png +%{_datadir}/icons/hicolor/128x128/apps/elementary.png %{_libdir}/elementary/modules/ /usr/lib/debug/%{_libdir}/elementary/modules/ %exclude %{_datadir}/elementary/config/