ecore: reduce race condition.

[profile/ivi/ecore.git] / ecore.spec.in

diff --git a/ecore.spec.in b/ecore.spec.in
index 78a0ce9..f542bf7 100644 (file)
--- a/ecore.spec.in
+++ b/ecore.spec.in
@@ -35,10 +35,12 @@
 %define ac_with_lib_ecore_imf       --%{?with_lib_ecore_imf:en}%{!?with_lib_ecore_imf:dis}able-ecore-imf
 %define ac_with_lib_ecore_sdl       --%{?with_lib_ecore_sdl:en}%{!?with_lib_ecore_sdl:dis}able-ecore-sdl
 
+%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}}
+
 Summary: Enlightened Core X interface library
 Name: @PACKAGE@
 Version: @VERSION@
-Release: 0.%(date '+%Y%m%d')
+Release: %{_rel}
 License: BSD
 Group: User Interface/X
 Source: %{name}-%{version}.tar.gz
@@ -46,7 +48,7 @@ URL: http://www.enlightenment.org
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-#BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel
+#BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel, c-ares-devel
 BuildRequires: libjpeg-devel, openssl-devel %{?breq_lib_ecore_directfb}
 BuildRequires: curl-devel, evas-devel, eet-devel %{?breq_lib_ecore_sdl}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -62,20 +64,12 @@ Summary: Ecore headers and development libraries.
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: curl-devel, openssl-devel, evas-devel, eet-devel
-Requires: ecore-bin, ecore-con, ecore-config, ecore-evas, ecore-file, ecore-ipc, ecore-job, ecore-txt
+Requires: ecore-con, ecore-evas, ecore-file, ecore-ipc
 Requires: ecore-x %{?with_lib_ecore_fb:ecore-fb} %{?with_lib_ecore_directfb:ecore-directfb}
 
 %description devel
 Ecore development files
 
-%package bin
-Summary: Tools that support Ecore
-Group: Development/Libraries
-Requires: %{name} = %{version}
-
-%description bin
-Tools that support Ecore
-
 %package con
 Summary: Ecore Connection Library
 Group: Development/Libraries
@@ -84,14 +78,6 @@ Requires: %{name} = %{version}
 %description con
 Ecore Connection Library
 
-%package config
-Summary: Ecore Enlightened Property Library
-Group: Development/Libraries
-Requires: %{name} = %{version}
-
-%description config
-Ecore Enlightened Property Library
-
 %if %{with lib_ecore_directfb}
 %package directfb
 Summary: Ecore DirectFB system functions
@@ -135,29 +121,21 @@ Requires: %{name} = %{version}
 Ecore IMF functions
 %endif
 
-%package ipc
-Summary: Ecore inter-process communication functions
+%package input
+Summary: Ecore input functions
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
-%description ipc
-Ecore inter-process communication functions
+%description input
+Ecore input functions
 
-%package job
-Summary: Ecore job dealing functions
-Group: Development/Libraries
-Requires: %{name} = %{version}
-
-%description job
-Ecore job dealing functions
-
-%package txt
-Summary: Ecore text encoding conversion functions
+%package ipc
+Summary: Ecore inter-process communication functions
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
-%description txt
-Ecore text encoding conversion functions
+%description ipc
+Ecore inter-process communication functions
 
 %package x
 Summary: Ecore functions for dealing with the X Windows System
@@ -168,7 +146,7 @@ Requires: %{name} = %{version}
 Ecore functions for dealing with the X Windows System
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 CFLAGS="-I/usr/kerberos/include -I/usr/X11R6/include/X11/extensions"
@@ -184,6 +162,7 @@ export CFLAGS LDFLAGS
 
 %install
 %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
+%{find_lang} %{name}
 
 %post
 /sbin/ldconfig || :
@@ -194,52 +173,47 @@ export CFLAGS LDFLAGS
 %clean
 test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING* README*
-%{_libdir}/libecore.so.*
+%{_bindir}/ecore_test
+%{_libdir}/libecore*.so.*
 
 %files devel
 %defattr(-, root, root)
 %doc doc/html
 %{_libdir}/*.so
+%{_libdir}/ecore/immodules/*.so
+%{_libdir}/ecore/immodules/*.la
 %{_libdir}/*.la
 %{_libdir}/*.a
 %{_libdir}/pkgconfig/*
 #%{_datadir}/aclocal/*
-%{_includedir}/*.h
-
-%files bin
-%defattr(-, root, root)
-%{_bindir}/ecore_config
+%{_includedir}/ecore-1/*.h
 
 %files con
 %defattr(-, root, root)
-%{_libdir}/libecore_con.so.*
-
-%files config
-%defattr(-, root, root)
-%{_libdir}/libecore_config.so.*
+%{_libdir}/libecore_con*.so.*
 
 %if %{with lib_ecore_directfb}
 %files directfb
 %defattr(-, root, root)
-%{_libdir}/libecore_directfb.so.*
+%{_libdir}/libecore_directfb*.so.*
 %endif
 
 %files evas
 %defattr(-, root, root)
-%{_libdir}/libecore_evas.so.*
+%{_libdir}/libecore_evas*.so.*
 
 %if %{with lib_ecore_fb}
 %files fb
 %defattr(-, root, root)
-%{_libdir}/libecore_fb.so.*
+%{_libdir}/libecore_fb*.so.*
 %endif
 
 %files file
 %defattr(-, root, root)
-%{_libdir}/libecore_file.so.*
+%{_libdir}/libecore_file*.so.*
 
 %if %{with lib_ecore_imf}
 %files imf
@@ -247,18 +221,14 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libecore_imf*.so.*
 %endif
 
-%files ipc
+%files input
 %defattr(-, root, root)
-%{_libdir}/libecore_ipc.so.*
+%{_libdir}/libecore_input*.so.*
 
-%files job
-%defattr(-, root, root)
-%{_libdir}/libecore_job.so.*
-
-%files txt
+%files ipc
 %defattr(-, root, root)
-%{_libdir}/libecore_txt.so.*
+%{_libdir}/libecore_ipc*.so.*
 
 %files x
 %defattr(-, root, root)
-%{_libdir}/libecore_x.so.*
+%{_libdir}/libecore_x*.so.*