rpms/ekg2/F-9 .cvsignore, 1.4, 1.5 ekg2-gcc43.patch, 1.1, 1.2 ekg2-rpm.patch, 1.2, 1.3 ekg2.spec, 1.8, 1.9 sources, 1.4, 1.5
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Thu May 29 16:32:06 UTC 2008
- Previous message (by thread): rpms/a2ps/F-9 a2ps-4.13-conf.patch, 1.4, 1.5 a2ps-4.13-etc.patch, 1.2, 1.3 a2ps-4.13-euckr.patch, 1.1, 1.2 a2ps-4.13-hebrew.patch, 1.5, 1.6
- Next message (by thread): rpms/kernel-xen-2.6/F-9 linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch, NONE, 1.1 linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch, NONE, 1.1 linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch, NONE, 1.1 linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch, NONE, 1.1 linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch, NONE, 1.1 linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch, NONE, 1.1 linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch, NONE, 1.1 Makefile, 1.22, 1.23 Makefile.config, 1.22, 1.23 config-xen-x86_64, 1.5, 1.6 kernel.spec, 1.44, 1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/pkgs/rpms/ekg2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5789
Modified Files:
.cvsignore ekg2-gcc43.patch ekg2-rpm.patch ekg2.spec sources
Log Message:
sync with devel:
- updated to 0.2-rc1 (#435369)
- fixed multiarch conflicts (#341051)
- updated gcc43 patch
- fixed compilation against the new glibc
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 23 Oct 2007 22:52:38 -0000 1.4
+++ .cvsignore 29 May 2008 16:31:07 -0000 1.5
@@ -1 +1 @@
-ekg2-0.1.1.tar.gz
+ekg2-0.2-rc1.tar.gz
ekg2-gcc43.patch:
Index: ekg2-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-9/ekg2-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg2-gcc43.patch 14 Feb 2008 22:45:57 -0000 1.1
+++ ekg2-gcc43.patch 29 May 2008 16:31:07 -0000 1.2
@@ -1,12 +1,36 @@
-diff -up ekg2-0.1.1/plugins/jabber/commands.c.gcc43 ekg2-0.1.1/plugins/jabber/commands.c
---- ekg2-0.1.1/plugins/jabber/commands.c.gcc43 2007-03-02 10:11:03.000000000 +0100
-+++ ekg2-0.1.1/plugins/jabber/commands.c 2008-02-14 23:41:04.000000000 +0100
-@@ -282,7 +282,7 @@ static void jabber_command_connect_child
- if (!he)
- a.s_addr = INADDR_NONE;
- else
-- memcpy(&a, he->h_addr, sizeof(a));
-+ memcpy(&a, he->h_addr_list[0], sizeof(a));
- }
- #ifdef NO_POSIX_SYSTEM
- DWORD written = 0;
+diff -up ekg2-0.2-rc1/ekg/resolver.c.g ekg2-0.2-rc1/ekg/resolver.c
+--- ekg2-0.2-rc1/ekg/resolver.c.g 2008-02-28 21:23:03.000000000 +0100
++++ ekg2-0.2-rc1/ekg/resolver.c 2008-05-28 22:18:26.000000000 +0200
+@@ -125,7 +125,7 @@ watch_t *ekg_resolver2(plugin_t *plugin,
+ if (!he)
+ a.s_addr = INADDR_NONE;
+ else
+- memcpy(&a, he->h_addr, sizeof(a));
++ memcpy(&a, he->h_addr_list[0], sizeof(a));
+ }
+ write(fd[1], &a, sizeof(a));
+ xfree(myserver);
+diff -up ekg2-0.2-rc1/plugins/jabber/Makefile.am.g ekg2-0.2-rc1/plugins/jabber/Makefile.am
+--- ekg2-0.2-rc1/plugins/jabber/Makefile.am.g 2008-02-28 21:22:56.000000000 +0100
++++ ekg2-0.2-rc1/plugins/jabber/Makefile.am 2008-05-28 22:13:35.000000000 +0200
+@@ -4,7 +4,7 @@ lib_LTLIBRARIES = jabber.la
+ jabber_la_SOURCES = jabber.c commands.c misc.c digest.c xmlnode.c jabber_dcc.c jabber_handlers.c jabber.h jabber_dcc.h jabber-ssl.h
+ jabber_la_LDFLAGS = -module -avoid-version
+ jabber_la_LIBADD = $(EXPAT_LIBS) $(JABBER_SSL_LIBS) $(ZLIB_LIBS)
+-jabber_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) $(JABBER_SSL_CPPFLAGS)
++jabber_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) $(JABBER_SSL_CPPFLAGS) -D_POSIX_SOURCE
+
+ libdir = $(plugindir)
+
+diff -up ekg2-0.2-rc1/plugins/feed/Makefile.am.g ekg2-0.2-rc1/plugins/feed/Makefile.am
+--- ekg2-0.2-rc1/plugins/feed/Makefile.am.g 2008-02-28 21:23:00.000000000 +0100
++++ ekg2-0.2-rc1/plugins/feed/Makefile.am 2008-05-28 22:14:10.000000000 +0200
+@@ -2,7 +2,7 @@ lib_LTLIBRARIES = feed.la
+ feed_la_SOURCES = feed.c feed.h rss.c nntp.c
+ feed_la_LDFLAGS = -module -avoid-version
+ feed_la_LIBADD = $(EXPAT_LIBS)
+-feed_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS)
++feed_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) -D_POSIX_SOURCE
+
+ libdir = $(plugindir)
+
ekg2-rpm.patch:
Index: ekg2-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-9/ekg2-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ekg2-rpm.patch 28 Aug 2007 21:39:51 -0000 1.2
+++ ekg2-rpm.patch 29 May 2008 16:31:07 -0000 1.3
@@ -1,19 +1,7 @@
---- ekg2-20070305/plugins/gsm/main.c.r 2006-07-12 10:40:10.000000000 +0200
-+++ ekg2-20070305/plugins/gsm/main.c 2007-05-18 21:29:50.000000000 +0200
-@@ -27,6 +27,10 @@
- #else
- # ifdef HAVE_LIBGSM_GSM_H
- # include <libgsm/gsm.h>
-+# else
-+# ifdef HAVE_GSM_GSM_H
-+# include <gsm/gsm.h>
-+# endif
- # endif
- #endif
-
---- ekg2-20070305/plugins/perl/Makefile.am.r 2006-06-08 11:21:18.000000000 +0200
-+++ ekg2-20070305/plugins/perl/Makefile.am 2007-05-18 21:29:50.000000000 +0200
-@@ -16,7 +16,7 @@
+diff -up ekg2-0.2-rc1/plugins/perl/Makefile.am.r ekg2-0.2-rc1/plugins/perl/Makefile.am
+--- ekg2-0.2-rc1/plugins/perl/Makefile.am.r 2008-02-28 21:22:59.000000000 +0100
++++ ekg2-0.2-rc1/plugins/perl/Makefile.am 2008-05-28 20:19:20.000000000 +0200
+@@ -16,7 +16,7 @@ all-local:
for dir in $(perl_dirs); do \
cd $$dir && \
if [ ! -f Makefile ]; then \
@@ -22,9 +10,10 @@
fi && \
$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" && \
cd ..; \
---- ekg2-20070305/plugins/ioctld/Makefile.am.r 2007-02-27 21:54:02.000000000 +0100
-+++ ekg2-20070305/plugins/ioctld/Makefile.am 2007-05-18 21:29:50.000000000 +0200
-@@ -9,7 +9,7 @@
+diff -up ekg2-0.2-rc1/plugins/ioctld/Makefile.am.r ekg2-0.2-rc1/plugins/ioctld/Makefile.am
+--- ekg2-0.2-rc1/plugins/ioctld/Makefile.am.r 2008-02-28 21:23:01.000000000 +0100
++++ ekg2-0.2-rc1/plugins/ioctld/Makefile.am 2008-05-28 20:19:20.000000000 +0200
+@@ -9,7 +9,7 @@ libdir = $(plugindir)
libexec_PROGRAMS = ioctld
ioctld_SOURCES = ioctld.c ioctld.h
@@ -33,9 +22,10 @@
install-data-am:
mkdir -p $(DESTDIR)$(pkgdatadir)/plugins/ioctld/
---- ekg2-20070305/plugins/ncurses/Makefile.am.r 2007-02-27 21:54:13.000000000 +0100
-+++ ekg2-20070305/plugins/ncurses/Makefile.am 2007-05-18 21:29:50.000000000 +0200
-@@ -9,6 +9,7 @@
+diff -up ekg2-0.2-rc1/plugins/ncurses/Makefile.am.r ekg2-0.2-rc1/plugins/ncurses/Makefile.am
+--- ekg2-0.2-rc1/plugins/ncurses/Makefile.am.r 2008-02-28 21:22:53.000000000 +0100
++++ ekg2-0.2-rc1/plugins/ncurses/Makefile.am 2008-05-28 20:19:20.000000000 +0200
+@@ -9,6 +9,7 @@ ncurses_la_CPPFLAGS = $(C_FVISIBILITY) $
libdir = $(plugindir)
INCLUDES = -DDATADIR=\"$(datadir)/ekg\"
@@ -43,22 +33,9 @@
install-data-am:
mkdir -p $(DESTDIR)$(pkgdatadir)/plugins/ncurses/
---- ekg2-20070305/m4/libgsm.m4.r 2006-08-21 14:19:32.000000000 +0200
-+++ ekg2-20070305/m4/libgsm.m4 2007-05-18 21:29:50.000000000 +0200
-@@ -27,6 +27,11 @@
- AC_CHECK_HEADERS([libgsm/gsm.h],
- [
- have_libgsm_h="yes"
-+ ], [
-+ AC_CHECK_HEADERS([gsm/gsm.h],
-+ [
-+ have_libgsm_h="yes"
-+ ])
- ])
- ])
-
---- ekg2-20070305/docs/ekg2book/sheet.xsl.r 2005-09-07 22:40:03.000000000 +0200
-+++ ekg2-20070305/docs/ekg2book/sheet.xsl 2007-05-18 21:29:50.000000000 +0200
+diff -up ekg2-0.2-rc1/docs/ekg2book/sheet.xsl.r ekg2-0.2-rc1/docs/ekg2book/sheet.xsl
+--- ekg2-0.2-rc1/docs/ekg2book/sheet.xsl.r 2008-02-28 21:23:01.000000000 +0100
++++ ekg2-0.2-rc1/docs/ekg2book/sheet.xsl 2008-05-28 20:19:20.000000000 +0200
@@ -4,7 +4,7 @@
<!-- xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl"/ -->
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" />
@@ -68,9 +45,22 @@
<xsl:variable name="chunk.section.depth" select="'1'"/>
</xsl:stylesheet>
---- ekg2-20070305/docs/ekg2book/Makefile.r 2005-11-14 17:31:11.000000000 +0100
-+++ ekg2-20070305/docs/ekg2book/Makefile 2007-05-18 21:29:50.000000000 +0200
-@@ -3,7 +3,7 @@
+diff -up ekg2-0.2-rc1/docs/ekg2book/Makefile.r ekg2-0.2-rc1/docs/ekg2book/Makefile
+--- ekg2-0.2-rc1/docs/ekg2book/Makefile.r 2008-02-28 21:23:01.000000000 +0100
++++ ekg2-0.2-rc1/docs/ekg2book/Makefile 2008-05-28 20:19:20.000000000 +0200
+@@ -3,7 +3,7 @@ XSLTRANSFORMER="xsltproc"
+ all:
+ rm -rf book
+ ./generate.sh
+- $(XSLTRANSFORMER) -stringparam chunker.output.encoding ISO-8859-2 sheet.xsl book.xml
++ $(XSLTRANSFORMER) -stringparam chunker.output.encoding UTF-8 sheet.xsl book.xml
+ mkdir book
+ mv *.html book/
+
+diff -up ekg2-0.2-rc1/docs/ekg2book-en/Makefile.r ekg2-0.2-rc1/docs/ekg2book-en/Makefile
+--- ekg2-0.2-rc1/docs/ekg2book-en/Makefile.r 2008-02-28 21:23:01.000000000 +0100
++++ ekg2-0.2-rc1/docs/ekg2book-en/Makefile 2008-05-28 22:44:48.000000000 +0200
+@@ -3,7 +3,7 @@ XSLTRANSFORMER="xsltproc"
all:
rm -rf book
./generate.sh
@@ -79,36 +69,41 @@
mkdir book
mv *.html book/
---- ekg2-20070305/contrib/perl/xmms.pl.r 2006-06-08 11:01:24.000000000 +0200
-+++ ekg2-20070305/contrib/perl/xmms.pl 2007-05-18 21:29:50.000000000 +0200
+diff -up ekg2-0.2-rc1/contrib/perl/xmms.pl.r ekg2-0.2-rc1/contrib/perl/xmms.pl
+--- ekg2-0.2-rc1/contrib/perl/xmms.pl.r 2008-02-28 21:23:02.000000000 +0100
++++ ekg2-0.2-rc1/contrib/perl/xmms.pl 2008-05-28 20:19:20.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# XMMS-InfoPipe front-end - allow /np [dest]
#
# Thanks to ak for suggestions and even changes.
---- ekg2-20070305/contrib/perl/slownik.pl.r 2006-06-08 11:01:24.000000000 +0200
-+++ ekg2-20070305/contrib/perl/slownik.pl 2007-05-18 21:29:50.000000000 +0200
+diff -up ekg2-0.2-rc1/contrib/perl/slownik.pl.r ekg2-0.2-rc1/contrib/perl/slownik.pl
+--- ekg2-0.2-rc1/contrib/perl/slownik.pl.r 2008-02-28 21:23:02.000000000 +0100
++++ ekg2-0.2-rc1/contrib/perl/slownik.pl 2008-05-28 20:19:20.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# YDP Dictionary bot based on socket, Michal 'GiM' Spadlinski
# requires sockydpdict :)
#
---- ekg2-20070305/contrib/perl/dns.pl.r 2006-06-23 11:10:01.000000000 +0200
-+++ ekg2-20070305/contrib/perl/dns.pl 2007-05-18 21:29:50.000000000 +0200
+diff -up ekg2-0.2-rc1/contrib/perl/dns.pl.r ekg2-0.2-rc1/contrib/perl/dns.pl
+--- ekg2-0.2-rc1/contrib/perl/dns.pl.r 2008-02-28 21:23:02.000000000 +0100
++++ ekg2-0.2-rc1/contrib/perl/dns.pl 2008-05-28 20:19:20.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# /DNS <nick>|<host>|<ip> ...
use Ekg2;
---- ekg2-20070305/contrib/perl/audioscrobbler_bot.pl.r 2006-06-23 11:10:01.000000000 +0200
-+++ ekg2-20070305/contrib/perl/audioscrobbler_bot.pl 2007-05-18 21:29:50.000000000 +0200
+diff -up ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl.r ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl
+--- ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl.r 2008-02-28 21:23:02.000000000 +0100
++++ ekg2-0.2-rc1/contrib/perl/audioscrobbler_bot.pl 2008-05-28 20:19:20.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# Audioscrobbler BOT
# Michal 'GiM' Spadlinski
# 12-12-2005
---- ekg2-20070305/contrib/perl/ggbe.pl.r 2006-06-08 11:01:24.000000000 +0200
-+++ ekg2-20070305/contrib/perl/ggbe.pl 2007-05-18 21:29:50.000000000 +0200
+diff -up ekg2-0.2-rc1/contrib/perl/ggbe.pl.r ekg2-0.2-rc1/contrib/perl/ggbe.pl
+--- ekg2-0.2-rc1/contrib/perl/ggbe.pl.r 2008-02-28 21:23:02.000000000 +0100
++++ ekg2-0.2-rc1/contrib/perl/ggbe.pl 2008-05-28 20:19:20.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# Michal 'GiM' Spadlinski
Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-9/ekg2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ekg2.spec 7 Mar 2008 01:52:30 -0000 1.8
+++ ekg2.spec 29 May 2008 16:31:07 -0000 1.9
@@ -4,11 +4,11 @@
Summary: Multi-protocol instant messaging and chat client
Summary(pl): Wieloprotokołowy komunikator internetowy
Name: ekg2
-Version: 0.1.1
-Release: 4%{?dist}
+Version: 0.2
+Release: 0.1.rc1%{?dist}
License: GPLv2
Group: Applications/Internet
-Source0: http://pl.ekg2.org/%{name}-%{version}.tar.gz
+Source0: http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
Patch1: %{name}-rpm.patch
Patch2: %{name}-gcc43.patch
URL: http://www.ekg2.org/
@@ -64,6 +64,7 @@
Summary(pl): Pliki nagłówkowe dla ekg2
Group: Development/Libraries
Requires: %{name}-core = %{version}-%{release}
+Requires: pkgconfig
%description devel
Development headers for ekg2.
@@ -193,7 +194,7 @@
Wtyczka skryptów Perla dla ekg2.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
%patch1 -p1 -b .r
%patch2 -p1 -b .gcc43
cp -p README README-main
@@ -207,6 +208,8 @@
done
%build
+touch ChangeLog
+autoreconf -f -i
%configure \
--disable-static \
--enable-shared \
@@ -244,6 +247,9 @@
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
+rm $RPM_BUILD_ROOT%{_datadir}/ekg2/plugins/jabber/jabber_handlers*.c
+rm $RPM_BUILD_ROOT%{_bindir}/ekg2-config
+
%find_lang %{name}
%clean
@@ -260,12 +266,15 @@
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%attr(755,root,root) %{_libdir}/%{name}/plugins/autoresponder.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/feed.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/httprc_xajax.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/irc.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/jogger.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/logs.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/mail.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/ncurses.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/pcm.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/polchat.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/rc.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/rot13.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/sim.so
@@ -289,7 +298,6 @@
%files devel
%defattr(644,root,root,755)
%doc docs/TODO
-%attr(755,root,root) %{_bindir}/%{name}-config
%{_includedir}/%{name}
%files gadu-gadu
@@ -347,6 +355,12 @@
%attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so
%changelog
+* Wed May 28 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.1.rc1
+- updated to 0.2-rc1 (#435369)
+- fixed multiarch conflicts (#341051)
+- updated gcc43 patch
+- fixed compilation against the new glibc
+
* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.1-4
Rebuild for new perl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 23 Oct 2007 22:52:38 -0000 1.4
+++ sources 29 May 2008 16:31:07 -0000 1.5
@@ -1 +1 @@
-8c64ab909687b9ac3798caa7736d7b2a ekg2-0.1.1.tar.gz
+7ef64a54c8bbca927f8eccc9b10c9edd ekg2-0.2-rc1.tar.gz
- Previous message (by thread): rpms/a2ps/F-9 a2ps-4.13-conf.patch, 1.4, 1.5 a2ps-4.13-etc.patch, 1.2, 1.3 a2ps-4.13-euckr.patch, 1.1, 1.2 a2ps-4.13-hebrew.patch, 1.5, 1.6
- Next message (by thread): rpms/kernel-xen-2.6/F-9 linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch, NONE, 1.1 linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch, NONE, 1.1 linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch, NONE, 1.1 linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch, NONE, 1.1 linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch, NONE, 1.1 linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch, NONE, 1.1 linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch, NONE, 1.1 Makefile, 1.22, 1.23 Makefile.config, 1.22, 1.23 config-xen-x86_64, 1.5, 1.6 kernel.spec, 1.44, 1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list