packages: ekg2/ekg2.spec, ekg2/ekg2-largefile.patch - merged DEVEL

[pawelz]

Author: pawelz                       Date: Fri Aug 28 09:34:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged DEVEL

---- Files affected:
packages/ekg2:
   ekg2.spec (1.105 -> 1.106) , ekg2-largefile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.105 packages/ekg2/ekg2.spec:1.106
--- packages/ekg2/ekg2.spec:1.105	Sun Jul 12 15:21:25 2009
+++ packages/ekg2/ekg2.spec	Fri Aug 28 11:34:00 2009
@@ -1,11 +1,9 @@
 # $Revision$, $Date$
 # TODO:
-# - autotools (call it directly, or fix autogen.sh)
 # - warning: Installed (but unpackaged) file(s) found:
 #   /usr/lib/perl5/5.10.0/i686-pld-linux-thread-multi/perllocal.pod
 #   /usr/lib/perl5/vendor_perl/5.10.0/i686-pld-linux-thread-multi/auto/Ekg2/.packlist
 #   /usr/lib/perl5/vendor_perl/5.10.0/i686-pld-linux-thread-multi/auto/Ekg2/Irc/.packlist
-# - Is missing-xwcslen.patch needed?
 #
 # Conditional build:
 %bcond_without	aspell			# build without spell-checking support with aspell
@@ -25,7 +23,8 @@
 
 # Please, test all modules before updating. If you want just try new version,
 # use DEVEL branch.
-%define		_snap 20090622
+
+%define		_snap 20090828
 
 %if %{without jabber}
 %undefine with_gnutls
@@ -38,17 +37,16 @@
 Summary:	Multi-protocol instant messaging and chat client
 Summary(pl.UTF-8):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
-Version:	0.1.3
-Release:	0.%{_snap}.2
+Version:	0.3
+Release:	0.%{_snap}.1
 Epoch:		2
 License:	GPL v2+
 Group:		Applications/Communications
 Source0:	http://pl.ekg2.org/%{name}-%{_snap}.tar.bz2
-# Source0-md5:	3ac6f70fdf92daf05d6975763eda460f
+# Source0-md5:	a2121ea05a1f16ce970c1719cba2dbc0
 Patch0:		%{name}-perl-install.patch
-# Is it really needed?
-# Patch1:		%{name}-missing-xwcslen.patch
-Patch2:		%{name}-gtk.patch
+Patch1:		%{name}-gtk.patch
+Patch2:		%{name}-largefile.patch
 URL:		http://ekg2.org/
 %{?with_aspell:BuildRequires:	aspell-devel}
 BuildRequires:	autoconf
@@ -56,7 +54,7 @@
 %if %{with feed} || %{with jabber}
 BuildRequires:	expat-devel
 %endif
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel >= 0.17-8
 %{?with_gadugadu:BuildRequires:	giflib-devel}
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 1.2.5}
 %{?with_gpg:BuildRequires:	gpgme-devel}
@@ -337,14 +335,19 @@
 %prep
 %setup -q -n %{name}-%{_snap}
 %patch0 -p1
-#%%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 
-sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac
 sed -i -e '\#/opt/sqlite/lib#s#"$# /usr/lib64"#' m4/sqlite.m4
 
 %build
-NOCONFIGURE=1 ./autogen.sh || true
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+
 # for hostent.h_addr (should be in CPPFLAGS, but it's overridden in plugins/jabber)
 CFLAGS="%{rpmcflags} -D_GNU_SOURCE"
 %configure \
@@ -537,14 +540,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.105  2009/07/12 13:21:25  arekm
-- rel .2
+Revision 1.106  2009/08/28 09:34:00  pawelz
+- merged DEVEL
 
-Revision 1.104  2009/06/26 20:38:11  pawelz
-- jabber plugin also handles tlen (updated subpackage descriptions)
+Revision 1.95.2.14  2009/08/28 08:12:35  pawelz
+- removed TODO line
 
-Revision 1.103  2009/06/24 18:21:50  pawelz
-- merged DEVEL (up to 20090622)
+Revision 1.95.2.13  2009/08/28 08:10:08  pawelz
+- up to 20090828
+- dropped sed oneliner, which is no longer needed
+
+Revision 1.95.2.12  2009/08/20 07:24:09  pawelz
+- dropped commented out patch. It seems to be no longer needed.
+- added largfile patch (thx zdzichuBG at ircnet)
+- resequenced patches
+
+Revision 1.95.2.11  2009/08/19 13:40:26  pawelz
+- up to 20090819 (equal to 20090808)
+- fixed version number. It is 0.3, not 0.1.3.
+- reverted autotools. It works again since gettext 0.17-8 (thx arekm).
+- merged changes from HEAD
+
+Revision 1.95.2.10  2009/07/13 11:10:33  pawelz
+- up to 20090713 (didn't changed from 20090706)
+- dropped autogen.sh. It does not work.
 
 Revision 1.95.2.9  2009/06/22 07:44:12  pawelz
 - package remote plugin

================================================================
Index: packages/ekg2/ekg2-largefile.patch
diff -u /dev/null packages/ekg2/ekg2-largefile.patch:1.2
--- /dev/null	Fri Aug 28 11:34:05 2009
+++ packages/ekg2/ekg2-largefile.patch	Fri Aug 28 11:34:00 2009
@@ -0,0 +1,11 @@
+--- a/configure.ac	2009-08-20 09:12:07.000000000 +0200
++++ b/configure.ac	2009-08-20 09:13:17.000000000 +0200
+@@ -21,6 +21,8 @@
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
++AC_SYS_LARGEFILE
++
+ dnl It's obsolete in current versions of gettext but it's needed in older
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.14.3])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.105&r2=1.106&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2-largefile.patch?r1=1.1&r2=1.2&f=u