X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=e_dbus.spec;h=54d8674660dbacb0f39c2d778a95c0071d845879;hb=9756a2739a22d8c99d15fd81ff995a3e24e6b944;hp=d53a330f218cdb138d84ae528809c0f5bb7de7a2;hpb=c67e204beba80835e80a20c657f712509c176aa7;p=packages%2Fe_dbus.git

diff --git a/e_dbus.spec b/e_dbus.spec
index d53a330..54d8674 100644
--- a/e_dbus.spec
+++ b/e_dbus.spec
@@ -2,26 +2,34 @@
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 #
-%define		ecore_ver	0.9.9.49898
-%define		snapdate	2010-06-27
-%define		svn		-ver-svn-06
+%define		ecore_ver	1.7.9
+%define		eina_ver	1.7.9
+%define		evas_ver	1.7.9
 
 Summary:	EFL wrapper for DBus
 Summary(pl.UTF-8):	Obudowanie EFL dla systemu DBus
 Name:		e_dbus
-Version:	0.5.0.49898
-Release:	0.1
-License:	LGPL v2.1
+Version:	1.7.9
+Release:	1
+License:	BSD
 Group:		Libraries
-Source0:	http://download.enlightenment.org/snapshots/%{snapdate}/%{name}-%{version}.tar.bz2
-# Source0-md5:	b94d01cc67028d9b6709dc37b222c436
-URL:		http://enlightenment.org/p.php?p=about/efl
+Source0:	http://download.enlightenment.org/releases/%{name}-%{version}.tar.bz2
+# Source0-md5:	713191ea66a4bdacc720a97046f7d0b7
+URL:		http://trac.enlightenment.org/e/wiki/E_Dbus
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1.6
 BuildRequires:	dbus-devel >= 0.62
 BuildRequires:	ecore-devel >= %{ecore_ver}
+BuildRequires:	ecore-evas-devel >= %{ecore_ver}
+BuildRequires:	eina-devel >= %{eina_ver}
+BuildRequires:	evas-devel >= %{ecore_ver}
 BuildRequires:	libtool
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 1:0.22
+Requires:	dbus-libs >= 0.62
+Requires:	ecore >= %{ecore_ver}
+Requires:	ecore-evas >= %{ecore_ver}
+Requires:	eina >= %{eina_ver}
+Requires:	evas >= %{evas_ver}
 Obsoletes:	ecore-dbus
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,6 +46,10 @@ Summary:	Header files for e_dbus library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki e_dbus
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	dbus-devel >= 0.62
+Requires:	ecore-devel >= %{ecore_ver}
+Requires:	eina-devel >= %{eina_ver}
+Requires:	evas-devel >= %{evas_ver}
 
 %description devel
 Header files for e_dbus library.
@@ -67,8 +79,9 @@ Statyczna biblioteka e_dbus.
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static}
-%{__make} V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,63 +97,55 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/e-notify-send
+%attr(755,root,root) %{_bindir}/e_dbus_async_client_test
+%attr(755,root,root) %{_bindir}/e_dbus_async_server_test
 %attr(755,root,root) %{_bindir}/e_dbus_bluez_test
-%attr(755,root,root) %{_bindir}/e_dbus_connman_test
+%attr(755,root,root) %{_bindir}/e_dbus_connman0_7x_test
 %attr(755,root,root) %{_bindir}/e_dbus_notification_daemon
 %attr(755,root,root) %{_bindir}/e_dbus_notify
 %attr(755,root,root) %{_bindir}/e_dbus_ofono_test
 %attr(755,root,root) %{_bindir}/e_dbus_test
 %attr(755,root,root) %{_bindir}/e_dbus_test_client
 %attr(755,root,root) %{_bindir}/e_dbus_ukit_test
-%attr(755,root,root) %{_libdir}/libebluez%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libebluez%{svn}.so.0
-%attr(755,root,root) %{_libdir}/libeconnman%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libeconnman%{svn}.so.0
-%attr(755,root,root) %{_libdir}/libedbus%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libedbus%{svn}.so.0
-%attr(755,root,root) %{_libdir}/libehal%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libehal%{svn}.so.0
-%attr(755,root,root) %{_libdir}/libenotify%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libenotify%{svn}.so.0
-%attr(755,root,root) %{_libdir}/libeofono%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libeofono%{svn}.so.0
-%attr(755,root,root) %{_libdir}/libeukit%{svn}.so.0.5.0
-%attr(755,root,root) %ghost %{_libdir}/libeukit%{svn}.so.0
+%attr(755,root,root) %{_libdir}/libebluez.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libebluez.so.1
+%attr(755,root,root) %{_libdir}/libeconnman0_7x.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libeconnman0_7x.so.1
+%attr(755,root,root) %{_libdir}/libedbus.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libedbus.so.1
+%attr(755,root,root) %{_libdir}/libehal.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libehal.so.1
+%attr(755,root,root) %{_libdir}/libenotify.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libenotify.so.1
+%attr(755,root,root) %{_libdir}/libeofono.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libeofono.so.1
+%attr(755,root,root) %{_libdir}/libeukit.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libeukit.so.1
+%{_datadir}/e_dbus
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libebluez.so
-%attr(755,root,root) %{_libdir}/libeconnman.so
+%attr(755,root,root) %{_libdir}/libeconnman0_7x.so
 %attr(755,root,root) %{_libdir}/libedbus.so
 %attr(755,root,root) %{_libdir}/libehal.so
-#%attr(755,root,root) %{_libdir}/libenm.so
 %attr(755,root,root) %{_libdir}/libenotify.so
 %attr(755,root,root) %{_libdir}/libeofono.so
 %attr(755,root,root) %{_libdir}/libeukit.so
 %{_libdir}/libebluez.la
-%{_libdir}/libeconnman.la
+%{_libdir}/libeconnman0_7x.la
 %{_libdir}/libedbus.la
 %{_libdir}/libehal.la
 %{_libdir}/libeofono.la
 %{_libdir}/libeukit.la
-#%{_libdir}/libenm.la
 %{_libdir}/libenotify.la
-%{_includedir}/E_Bluez.h
-%{_includedir}/E_Connman.h
-%{_includedir}/E_DBus.h
-%{_includedir}/E_Hal.h
-#%{_includedir}/E_Nm.h
-%{_includedir}/E_Notification_Daemon.h
-%{_includedir}/E_Notify.h
-%{_includedir}/E_Ofono.h
-%{_includedir}/E_Ukit.h
+%{_includedir}/e_dbus-1
 %{_pkgconfigdir}/ebluez.pc
-%{_pkgconfigdir}/econnman.pc
+%{_pkgconfigdir}/econnman-0.7x.pc
 %{_pkgconfigdir}/edbus.pc
 %{_pkgconfigdir}/ehal.pc
-#%{_pkgconfigdir}/enm.pc
 %{_pkgconfigdir}/enotify.pc
 %{_pkgconfigdir}/eofono.pc
 %{_pkgconfigdir}/eukit.pc
@@ -149,10 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libebluez.a
-%{_libdir}/libeconnman.a
+%{_libdir}/libeconnman0_7x.a
 %{_libdir}/libedbus.a
 %{_libdir}/libehal.a
-#%{_libdir}/libenm.a
 %{_libdir}/libenotify.a
 %{_libdir}/libeofono.a
 %{_libdir}/libeukit.a