From ed9273c2dd0e26c0cc262a5ed841ef982127702f Mon Sep 17 00:00:00 2001 From: Peter Gordon Date: Oct 01 2007 00:22:39 +0000 Subject: Update to 0.13; various other minor cleanups. Add -libs and -python subpackages. --- diff --git a/.cvsignore b/.cvsignore index 787bea2..37dfa9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ empathy-0.12.tar.bz2 +empathy-0.13.tar.bz2 diff --git a/empathy.spec b/empathy.spec index a26ec8b..204701a 100644 --- a/empathy.spec +++ b/empathy.spec @@ -1,6 +1,16 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +## Minimum required versions of GLib, GTK+, libtelepathy, and Mission-Control, +## respectively. +%global gtk2_min_version 2.12 +%global glib2_min_version 2.14 +%global tp_mc_min_version 4.33 +%global libtp_min_version 0.0.57 + Name: empathy -Version: 0.12 -Release: 2%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: GNOME Instant Messaging Client Group: Applications/Communications @@ -10,41 +20,47 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{ver BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel -BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel -BuildRequires: GConf2-devel >= 1.2.0 +BuildRequires: GConf2-devel BuildRequires: gettext -BuildRequires: glib2-devel >= 2.12.0 -BuildRequires: gtk2-devel -BuildRequires: perl(XML::Parser) -BuildRequires: intltool +BuildRequires: glib2-devel >= %{glib2_min_version} +BuildRequires: gnome-panel-devel +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk2-devel >= %{gtk2_min_version} BuildRequires: libglade2-devel -BuildRequires: libgnomeui-devel -BuildRequires: libtelepathy-devel >= 0.0.51 -BuildRequires: telepathy-mission-control-devel >= 4.33 +BuildRequires: libtelepathy-devel >= %{libtp_min_version} +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: perl(XML::Parser) +BuildRequires: pygtk2-devel +BuildRequires: telepathy-mission-control-devel >= %{tp_mc_min_version} +Requires: %{name}-libs = %{version}-%{release} Requires: telepathy-filesystem - + Requires(pre): GConf2 + Requires(post): GConf2 Requires(post): scrollkeeper + Requires(preun): GConf2 + Requires(postun): scrollkeeper %description Empathy provides a powerful multiple protocol instant messaging -client using Telepathy +client using the Telepathy framework. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig ## Needs these for the various #include directives in its headers, as well ## as pkgconfig dependencies... -Requires: glib2-devel -Requires: telepathy-mission-control-devel +Requires: glib2-devel >= %{glib2_min_version} +Requires: telepathy-mission-control-devel >= %{tp_mc_min_version} Requires: libxml2-devel %description devel @@ -52,70 +68,91 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package libs +Summary: Shared libraries for %{name} +Group: Development/Libraries +Requires: glib2 >= %{glib2_min_version} +Requires: gtk2 >= %{gtk2_min_version} +Requires: libtelepathy >= %{libtp_min_version} +Requires: telepathy-mission-control >= %{tp_mc_min_version} + +%description libs +The %{name}-libs package contains shared libraries used by Empathy. + + +%package python +Summary: Python bindings for libempathy and libempathy-gtk +Group: Development/Languages +Requires: %{name}-libs = %{version}-%{release} + +%description python +This package contains the empathy and empathygtk Python modules, which provide +bindings to the libempathy and libempathy-gtk libraries, respectively. + %prep %setup -q %build -## FIXME: The python bindings have broken install scripts (calling -## non-existent pyversions utility). -%configure --enable-python=no -make %{?_smp_mflags} +%configure +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -# remove --no-connect from the .desktop file -# without this empathy won't launch from the menu -sed -i 's/--no-connect//' \ -$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/%{name}.desktop +## Remove --no-connect from the .desktop file; without this empathy won't +## launch from the menu. +sed -i 's/--no-connect//' %{buildroot}%{_datadir}/gnome/autostart/%{name}.desktop desktop-file-install --vendor fedora --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/%{name}.desktop + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/gnome/autostart/%{name}.desktop %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %pre if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : + export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: fi %post -/sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: +scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||: +touch --no-create %{_datadir}/icons/hicolor ||: +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||: + +%post libs -p /sbin/ldconfig %preun if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : + export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||: fi %postun -/sbin/ldconfig scrollkeeper-update -q || : touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%postun libs -p /sbin/ldconfig + %files -f %{name}.lang %defattr(-,root,root,-) @@ -123,6 +160,7 @@ fi %exclude %{_libdir}/*.la %exclude %{_libdir}/*.a %{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas %{_bindir}/empathy %{_bindir}/empathy-accounts %{_datadir}/dbus-1/services/org.gnome.Empathy.Chat.service @@ -131,6 +169,12 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}* %{_datadir}/mission-control/profiles/* %{_datadir}/telepathy/managers/empathy-chat.chandler +%{_libexecdir}/megaphone-applet +%{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server + +%files libs +%defattr(-,root,root,-) +%doc COPYING %{_libdir}/libempathy*.so.* %files devel @@ -141,8 +185,21 @@ fi %{_libdir}/pkgconfig/libempathy*.pc %{_datadir}/gtk-doc/html/libempathy* +%files python +%defattr(-,root,root,-) +%doc COPYING +%exclude %{python_sitearch}/*.a +%exclude %{python_sitearch}/*.la +%{python_sitearch}/empathy*.so + %changelog +* Sun Sep 30 2007 Peter Gordon - 0.13-1 +- Update to new upstream release (0.13), which adds a panel applet (Megaphone) + and python bindings. +- Split shared libraries into a libs subpackage for easier handling + in multi-lib environments. + * Fri Aug 31 2007 Peter Gordon - 0.12-2 - Add ldconfig invocations to %%post and %%postun scriptlets. diff --git a/sources b/sources index e6cd778..42d62b8 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ bd573be24ca435accb9313f41301a656 empathy-0.12.tar.bz2 +7b2470404e3f5466c015b2eac2120ad2 empathy-0.13.tar.bz2