From 3dd5c50e29aa9afa7f567bae9d114cab31b0bd6c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Nov 28 2007 13:15:55 +0000 Subject: Attempt to fix something rotten in ICQ --- diff --git a/.cvsignore b/.cvsignore index 024d1fb..b72181c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ centerim-20071022.tar.gz +centerim-20071022-20071124.patch.gz diff --git a/centerim.spec b/centerim.spec index 297f074..80e9c5d 100644 --- a/centerim.spec +++ b/centerim.spec @@ -1,10 +1,11 @@ # These are ugly and will go away on next formal release %define stable_ver 4.22.1 -%define snapshot_ver 20071022 +%define tarball_ver 20071022 +%define git_ver 20071124 Name: centerim -Version: %{stable_ver}.%{snapshot_ver} -Release: 1%{?dist} +Version: %{stable_ver}.%{git_ver} +Release: 2%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -12,7 +13,8 @@ Summary: Text mode menu- and window-driven IM Group: Applications/Internet License: GPLv2+ URL: http://www.centerim.org/ -Source0: http://www.centerim.org/download/%{name}-%{snapshot_ver}.tar.gz +Source0: http://www.centerim.org/download/%{name}-%{tarball_ver}.tar.gz +Patch0: centerim-%{tarball_ver}-%{git_ver}.patch.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,19 +30,27 @@ CenterIM is a text mode menu- and window-driven IM interface that supports the ICQ2000, Yahoo!, MSN, AIM TOC, IRC, Gadu-Gadu and Jabber protocols. Internal RSS reader and a client for LiveJournal are provided. + %prep %setup -q -n %{name}-%{stable_ver} +%patch0 -p1 + %build +# Temporary hack due to bad timestamps to avoid +# regeneration of autoconf stuff when doing 'make' +find . |xargs touch -r README %configure \ --with-ssl \ --disable-rpath \ --enable-locales-fix make %{?_smp_flags} + %check make check + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -49,9 +59,11 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_infodir}/dir find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + %clean rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO @@ -60,7 +72,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/* %{_mandir}/man1/* + %changelog +* Wed Nov 28 2007 Lubomir Kundrak - 1:4.22.1.20071124-2 +- Synchronized with GIT to fix the ICQ client side contacts problems (#402301) + * Thu Oct 25 2007 Lubomir Kundrak - 1:4.22.1.20071022-1 - New upstream tarball, functionally equivalent to previous revision of the pkg diff --git a/sources b/sources index 1f68c37..91037a6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ fae3d8598e5cb35de28d8e778263ca15 centerim-20071022.tar.gz +9b6dc385c6f0d2ead3a8bdcb4d601d49 centerim-20071022-20071124.patch.gz