rpms/empathy/F-7 .cvsignore, 1.4, 1.5 empathy.spec, 1.3, 1.4 sources, 1.4, 1.5
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Fri Aug 31 17:32:06 UTC 2007
Author: pgordon
Update of /cvs/extras/rpms/empathy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25201/F-7
Modified Files:
.cvsignore empathy.spec sources
Log Message:
Update to 0.12; Update License tag.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/empathy/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 22 Jun 2007 14:18:50 -0000 1.4
+++ .cvsignore 31 Aug 2007 17:31:34 -0000 1.5
@@ -1 +1 @@
-empathy-0.8.tar.bz2
+empathy-0.12.tar.bz2
Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/F-7/empathy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- empathy.spec 22 Jun 2007 14:18:50 -0000 1.3
+++ empathy.spec 31 Aug 2007 17:31:34 -0000 1.4
@@ -1,26 +1,27 @@
Name: empathy
-Version: 0.8
+Version: 0.12
Release: 1%{?dist}
Summary: GNOME Instant Messaging Client
Group: Applications/Communications
-License: GPL
+License: GPLv2+
URL: http://live.gnome.org/Empathy
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtelepathy-devel >= 0.0.51
-BuildRequires: perl(XML::Parser)
-BuildRequires: glib2-devel >= 2.12.0
+BuildRequires: aspell-devel
+BuildRequires: desktop-file-utils
+BuildRequires: evolution-data-server-devel
BuildRequires: GConf2-devel >= 1.2.0
-BuildRequires: telepathy-mission-control-devel >= 4.22
+BuildRequires: gettext
+BuildRequires: glib2-devel >= 2.12.0
BuildRequires: gtk2-devel
+BuildRequires: perl(XML::Parser)
+BuildRequires: intltool
BuildRequires: libglade2-devel
BuildRequires: libgnomeui-devel
-BuildRequires: intltool
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: aspell-devel
+BuildRequires: libtelepathy-devel >= 0.0.51
+BuildRequires: telepathy-mission-control-devel >= 4.33
Requires: telepathy-filesystem
@@ -34,30 +35,51 @@
Empathy provides a powerful multiple protocol instant messaging
client using Telepathy
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{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: libxml2-devel
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
%prep
%setup -q
+
%build
-%configure
+## FIXME: The python bindings have broken install scripts (calling
+## non-existent pyversions utility).
+%configure --enable-python=no
make %{?_smp_mflags}
+
%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
-
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/%{name}.desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -65,7 +87,9 @@
%{_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 || :
@@ -75,6 +99,7 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -82,31 +107,52 @@
%{_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
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/*.a
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/empathy
%{_bindir}/empathy-accounts
%{_datadir}/dbus-1/services/org.gnome.Empathy.Chat.service
%{_datadir}/empathy/
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}*.png
-%{_datadir}/icons/hicolor/22x22/apps/%{name}*.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}*.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg
+%{_datadir}/icons/hicolor/*/apps/%{name}*
%{_datadir}/mission-control/profiles/*
%{_datadir}/telepathy/managers/empathy-chat.chandler
+%{_libdir}/libempathy*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_includedir}/libempathy*/
+%{_libdir}/libempathy*.so
+%{_libdir}/pkgconfig/libempathy*.pc
+%{_datadir}/gtk-doc/html/libempathy*
+
%changelog
+* Fri Aug 31 2007 Peter Gordon <peter at thecodergeek.com> - 0.12-1
+- Update to new upstream release (0.12).
+- Build against new mission-control stack.
+- Update License tag (GPLv2+).
+- Alphabetize BuildRequires list (aesthetic-only change).
+- Add ldconfig invocations to %%post and %%postun scriptlets.
+
+* Mon Aug 13 2007 Peter Gordon <peter at thecodergeek.com> - 0.11-1
+- Update to new upstream release (0.11)
+
* Fri Jun 22 2007 David Nielsen <david at lovesunix.net> - 0.8-1
- bump to 0.8
- Now with aspell support (deat to teh speeling mistaks)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/empathy/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Jun 2007 14:18:50 -0000 1.4
+++ sources 31 Aug 2007 17:31:34 -0000 1.5
@@ -1 +1 @@
-752074c88667fc796ee0cebe58a1f726 empathy-0.8.tar.bz2
+bd573be24ca435accb9313f41301a656 empathy-0.12.tar.bz2
More information about the scm-commits
mailing list