rpms/ekg2/devel ekg2-pkgconfig.patch, NONE, 1.1 ekg2.pc.in, NONE, 1.1 .cvsignore, 1.4, 1.5 ekg2-rpm.patch, 1.2, 1.3 ekg2.spec, 1.8, 1.9 sources, 1.4, 1.5 ekg2-gcc43.patch, 1.1, NONE
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Wed May 28 18:27:21 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7277
Modified Files:
.cvsignore ekg2-rpm.patch ekg2.spec sources
Added Files:
ekg2-pkgconfig.patch ekg2.pc.in
Removed Files:
ekg2-gcc43.patch
Log Message:
- updated to 0.2-rc1 (#435369)
- fix multiarch conflicts (#341051)
- dropped obsolete gcc43 patch
ekg2-pkgconfig.patch:
--- NEW FILE ekg2-pkgconfig.patch ---
diff -up ekg2-0.2-rc1/configure.ac.p ekg2-0.2-rc1/configure.ac
--- ekg2-0.2-rc1/configure.ac.p 2008-02-28 21:20:50.000000000 +0100
+++ ekg2-0.2-rc1/configure.ac 2008-05-28 20:11:56.000000000 +0200
@@ -109,7 +109,7 @@ AM_ICONV
AC_CHECK_LIBIDN
-AC_CONFIG_FILES([Makefile ekg/Makefile ekg/ekg2-config compat/Makefile docs/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile ekg/Makefile ekg/ekg2.pc compat/Makefile docs/Makefile po/Makefile.in])
AC_CONFIG_FILES([contrib/Makefile contrib/python/Makefile contrib/perl/Makefile])
AC_CONFIG_FILES([plugins/Makefile plugins/polchat/Makefile plugins/mail/Makefile plugins/logs/Makefile plugins/rc/Makefile plugins/sms/Makefile plugins/pcm/Makefile plugins/rot13/Makefile plugins/irc/Makefile plugins/httprc_xajax/Makefile plugins/xmsg/Makefile plugins/ioctld/Makefile plugins/gg/Makefile plugins/sim/Makefile plugins/jabber/Makefile plugins/ncurses/Makefile plugins/gtk/Makefile plugins/readline/Makefile plugins/gsm/Makefile plugins/xosd/Makefile plugins/perl/Makefile plugins/python/Makefile plugins/ruby/Makefile plugins/logsoracle/Makefile plugins/logsqlite/Makefile plugins/gpg/Makefile plugins/autoresponder/Makefile plugins/feed/Makefile plugins/jogger/Makefile])
diff -up ekg2-0.2-rc1/ekg/Makefile.am.p ekg2-0.2-rc1/ekg/Makefile.am
--- ekg2-0.2-rc1/ekg/Makefile.am.p 2008-02-28 21:23:04.000000000 +0100
+++ ekg2-0.2-rc1/ekg/Makefile.am 2008-05-28 20:09:15.000000000 +0200
@@ -2,7 +2,10 @@ ekg2_headers = audio.h audio_wav.h confi
commands.h debug.h emoticons.h log.h msgqueue.h plugins.h scripts.h stuff.h userlist.h windows.h win32.h ../gettext.h ../ekg2-config.h
bin_PROGRAMS = ekg2
-bin_SCRIPTS = ekg2-config
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ekg2.pc
+
ekg2_SOURCES = audio.c commands.c configfile.c dynstuff.c ekg.c emoticons.c events.c legacyconfig.c log.c metacontacts.c \
msgqueue.c plugins.c protocol.c sessions.c stuff.c themes.c userlist.c vars.c queries.h windows.c xmalloc.c resolver.c scripts.c strings.c win32.c $(ekg2_headers)
--- NEW FILE ekg2.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
datadir=@datadir@/@PACKAGE@
plugindir=@plugindir@
Name: Ekg2
Description: Multi-protocol instant messaging and chat client
Version: @VERSION@
Cflags: -I${includedir}/ekg2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/.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 28 May 2008 18:26:39 -0000 1.5
@@ -1 +1 @@
-ekg2-0.1.1.tar.gz
+ekg2-0.2-rc1.tar.gz
ekg2-rpm.patch:
Index: ekg2-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/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 28 May 2008 18:26:39 -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 19:50:28.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 19:50:28.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 19:50:28.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 19:50:28.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,10 @@
<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 19:50:28.000000000 +0200
+@@ -3,7 +3,7 @@ XSLTRANSFORMER="xsltproc"
all:
rm -rf book
./generate.sh
@@ -79,36 +57,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 19:50:28.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 19:50:28.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 19:50:28.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 19:50:28.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 19:50:28.000000000 +0200
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
# Michal 'GiM' Spadlinski
Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/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 28 May 2008 18:26:39 -0000 1.9
@@ -4,13 +4,14 @@
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
+Source1: %{name}.pc.in
Patch1: %{name}-rpm.patch
-Patch2: %{name}-gcc43.patch
+Patch2: %{name}-pkgconfig.patch
URL: http://www.ekg2.org/
BuildRequires: aspell-devel
BuildRequires: automake17
@@ -64,6 +65,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,9 +195,10 @@
Wtyczka skryptów Perla dla ekg2.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
+cp -p %{SOURCE1} ekg/
%patch1 -p1 -b .r
-%patch2 -p1 -b .gcc43
+%patch2 -p1 -b .p
cp -p README README-main
# convert docs to UTF-8
for file in \
@@ -207,6 +210,8 @@
done
%build
+touch ChangeLog
+autoreconf -f -i
%configure \
--disable-static \
--enable-shared \
@@ -260,12 +265,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 +297,7 @@
%files devel
%defattr(644,root,root,755)
%doc docs/TODO
-%attr(755,root,root) %{_bindir}/%{name}-config
+%{_libdir}/pkgconfig/%{name}.pc
%{_includedir}/%{name}
%files gadu-gadu
@@ -347,6 +355,11 @@
%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)
+- fix multiarch conflicts (#341051)
+- dropped obsolete gcc43 patch
+
* 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/devel/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 28 May 2008 18:26:39 -0000 1.5
@@ -1 +1 @@
-8c64ab909687b9ac3798caa7736d7b2a ekg2-0.1.1.tar.gz
+7ef64a54c8bbca927f8eccc9b10c9edd ekg2-0.2-rc1.tar.gz
--- ekg2-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list