packages: telepathy-butterfly/telepathy-butterfly.spec - up to 0.5.9, Log...

[glen]

Author: glen                         Date: Wed Apr 28 05:12:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.5.9,
  Logs format has changed, Empathy >= 2.29.92 handles automatically the migration.
  NOTE: 0.5.5 release disables audio/video calls, which have been broken since
  Microsoft removed the necessary servers.

---- Files affected:
packages/telepathy-butterfly:
   telepathy-butterfly.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/telepathy-butterfly/telepathy-butterfly.spec
diff -u packages/telepathy-butterfly/telepathy-butterfly.spec:1.9 packages/telepathy-butterfly/telepathy-butterfly.spec:1.10
--- packages/telepathy-butterfly/telepathy-butterfly.spec:1.9	Tue Apr 27 19:18:34 2010
+++ packages/telepathy-butterfly/telepathy-butterfly.spec	Wed Apr 28 07:12:23 2010
@@ -1,21 +1,23 @@
 # $Revision$, $Date$
-# TODO
-# - try system waf
 Summary:	A Telepathy connection manager for MSN
 Summary(pl.UTF-8):	Zarządca połączeń Telepathy dla MSN
 Name:		telepathy-butterfly
-Version:	0.5.4
+Version:	0.5.9
 Release:	1
 License:	LGPL
 Group:		Libraries
 Source0:	http://telepathy.freedesktop.org/releases/telepathy-butterfly/%{name}-%{version}.tar.gz
-# Source0-md5:	3cedf582597ebe742fe7c05fc6ec8943
+# Source0-md5:	1d663cf89346cf48a46c6f9119917a0e
 URL:		http://telepathy.freedesktop.org/wiki/
 BuildRequires:	python >= 1:2.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 Requires:	python-papyon >= 0.4.2
-Requires:	python-telepathy >= 0.15.11
+Requires:	python-telepathy >= 0.15.17
+Suggests:	python-libproxy
+Conflicts:	empathy < 2.29.92
+# we install to %{_libdir}, otherwise package could be noarch
+#BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -28,19 +30,15 @@
 %setup -q
 
 %build
-%ifarch %{x8664}
-PYTHONDIR=%{py_sitedir} \
-%endif
-./waf configure \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
-	--libexecdir=%{_libdir}
-./waf build
+%configure \
+	--host=%{_target} \
+	--build=%{_target}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-./waf --destdir=$RPM_BUILD_ROOT install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %py_postclean
 
@@ -53,14 +51,14 @@
 %attr(755,root,root) %{_libdir}/telepathy-butterfly
 %{_datadir}/telepathy/managers/butterfly.manager
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.butterfly.service
-%dir %{py_sitedir}/butterfly
-%{py_sitedir}/butterfly/*.py[co]
-%dir %{py_sitedir}/butterfly/channel
-%{py_sitedir}/butterfly/channel/*.py[co]
-%dir %{py_sitedir}/butterfly/util
-%{py_sitedir}/butterfly/util/*.py[co]
-%dir %{py_sitedir}/butterfly/media
-%{py_sitedir}/butterfly/media/*.py[co]
+%dir %{py_sitescriptdir}/butterfly
+%{py_sitescriptdir}/butterfly/*.py[co]
+%dir %{py_sitescriptdir}/butterfly/channel
+%{py_sitescriptdir}/butterfly/channel/*.py[co]
+%dir %{py_sitescriptdir}/butterfly/util
+%{py_sitescriptdir}/butterfly/util/*.py[co]
+%dir %{py_sitescriptdir}/butterfly/media
+%{py_sitescriptdir}/butterfly/media/*.py[co]
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -68,6 +66,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/04/28 05:12:23  glen
+- up to 0.5.9,
+  Logs format has changed, Empathy >= 2.29.92 handles automatically the migration.
+  NOTE: 0.5.5 release disables audio/video calls, which have been broken since
+  Microsoft removed the necessary servers.
+
 Revision 1.9  2010/04/27 17:18:34  glen
 - up to 0.5.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/telepathy-butterfly/telepathy-butterfly.spec?r1=1.9&r2=1.10&f=u