rpms/ekg2/devel ekg2-rpm.patch, NONE, 1.1 ekg2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Sat Jul 14 15:22:07 UTC 2007


Author: rathann

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28865/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ekg2-rpm.patch ekg2.spec 
Log Message:
- initial import


ekg2-rpm.patch:

--- NEW FILE ekg2-rpm.patch ---
--- 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 @@
 	for dir in $(perl_dirs); do \
 	 cd $$dir && \
 	 if [ ! -f Makefile ]; then \
-	   $(PERL) Makefile.PL; \
+	   $(PERL) Makefile.PL INSTALLDIRS="vendor"; \
 	 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 @@
 libexec_PROGRAMS = ioctld
 ioctld_SOURCES = ioctld.c ioctld.h
 
-INCLUDES = -DIOCTLD_PATH=\"$(libexecdir)/ioctld\" 
+INCLUDES = -DIOCTLD_PATH=\"$(libexecdir)/ekg2/ioctld\" 
 
 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 @@
 
 libdir = $(plugindir)
 INCLUDES = -DDATADIR=\"$(datadir)/ekg\" 
+AM_CFLAGS = -fno-strict-aliasing
 
 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
@@ -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" />
    <xsl:variable name="use.id.as.filename" select="'1'"/>
-   <xsl:variable name="chunker.output.encoding" select="'iso-8859-2'"/>
+   <xsl:variable name="chunker.output.encoding" select="'UTF-8'"/>
    <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 @@
 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/
 
--- 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
@@ -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/irc.pl.r	2007-05-18 21:29:50.000000000 +0200
+++ ekg2-20070305/contrib/perl/irc.pl	2007-05-18 21:30:36.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/env perl
+
 use vars qw($VERSION %EKG2);
 use Ekg2;
 use Ekg2::Irc;
--- 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
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
 # YDP Dictionary bot based on socket, Michal 'GiM' Spadlinski
 # requires sockydpdict :)
 # 
--- ekg2-20070305/contrib/perl/sample.pl.r	2007-05-18 21:29:50.000000000 +0200
+++ ekg2-20070305/contrib/perl/sample.pl	2007-05-18 21:30:27.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/env perl
+
 use Ekg2;
 
 sub ekg2_handle_status {
--- 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
@@ -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
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
 # Audioscrobbler BOT
 # Michal 'GiM' Spadlinski
 # 12-12-2005
--- ekg2-20070305/contrib/perl/dupa.pl.r	2007-05-18 21:29:50.000000000 +0200
+++ ekg2-20070305/contrib/perl/dupa.pl	2007-05-18 21:30:44.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/env perl
+
 # use strict;
 use Ekg2;
 
--- 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
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
 # Michal 'GiM' Spadlinski
 #
 # GG is fuj und bebe,


--- NEW FILE ekg2.spec ---
%define perl_archlib %(eval "`perl -V:archlib`";  echo $archlib)
%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)

%define		_snap 20070427

Summary:	Multi-protocol instant messaging and chat client
Summary(pl):	Wieloprotokołowy komunikator internetowy
Name:		ekg2
Version:	0
Release:	0.7.%{_snap}%{?dist}
License:	GPL
Group:		Applications/Internet
Source0:	http://pl.ekg2.org/%{name}-20070305.tar.gz
Patch0:		%{name}-%{_snap}.diff.gz
Patch1:		%{name}-rpm.patch
URL:		http://www.ekg2.org/
BuildRequires:	aspell-devel
BuildRequires:	docbook-style-xsl
BuildRequires:	expat-devel
BuildRequires:	gettext-devel
BuildRequires:	giflib-devel
BuildRequires:	gnutls-devel
BuildRequires:	gpgme-devel
BuildRequires:	gpm-devel
BuildRequires:	gtk2-devel
BuildRequires:	libgadu-devel
BuildRequires:	gsm-devel
BuildRequires:	libjpeg-devel
BuildRequires:	libxslt
BuildRequires:	libtool
BuildRequires:	ncurses-devel
BuildRequires:	openssl-devel
BuildRequires:	python-devel
BuildRequires:	sqlite-devel
BuildRequires:	xosd-devel
BuildConflicts: readline-devel
Requires:	%{name}-core = %{version}-%{release}
Requires:	%{name}-gadu-gadu = %{version}-%{release}
Requires:	%{name}-gpg = %{version}-%{release}
Requires:	%{name}-jabber = %{version}-%{release}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)

%description
Multi-protocol instant messaging and chat client with many plugins.
This is a meta package that installs ekg2 with popular plugins.

%description -l pl
Wieloprotokołowy, otwarty komunikator internetowy z wieloma wtyczkami.
To jest meta-pakiet instalujÄ…cy ekg2 z popularnymi wtyczkami.

%package core
Group:		Applications/Internet
Summary:	Multi-protocol instant messaging and chat client
Summary(pl):	Wieloprotokołowy komunikator internetowy

%description core
Multi-protocol instant messaging and chat client with many plugins.

%description core -l pl
Wieloprotokołowy, otwarty komunikator internetowy z wieloma wtyczkami.

%package devel
Summary:	Development headers for ekg2
Summary(pl):	Pliki nagłówkowe dla ekg2
Group:		Development/Libraries
Requires:	%{name}-core = %{version}-%{release}

%description devel
Development headers for ekg2.

%description devel -l pl
Pliki nagłówkowe dla ekg2.

%package gadu-gadu
Summary:	Gadu-gadu protocol plugin for ekg2
Summary(pl):	Wtyczka protokołu Gadu-gadu dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description gadu-gadu
Gadu-gadu protocol plugin for ekg2.

%description gadu-gadu -l pl
Wtyczka protokołu gadu-gadu dla ekg2.

%package jabber
Summary:	Jabber protocol plugin for ekg2
Summary(pl):	Wtyczka protokołu Jabber dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description jabber
Jabber protocol plugin for ekg2.

%description jabber -l pl
Wtyczka protokołu Jabber dla ekg2.

%package gpg
Summary:	GPG plugin for ekg2
Summary(pl):	Wtyczka GPG dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description gpg
GPG plugin for ekg2.

%description gpg -l pl
Wtyczka GPG dla ekg2.

%package gtk2
Summary:	GTK2 UI plugin for ekg2
Summary(pl):	Wtyczka GTK2 UI dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description gtk2
GTK2 UI plugin for ekg2.

%description gtk2 -l pl
Wtyczka GTK2 UI dla ekg2.

%package ioctld
Summary:	Keyboard LED control plugin for ekg2
Summary(pl):	Wtyczka do obsługi diod LED na klawiaturze dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description ioctld
Keyboard LED control plugin for ekg2.

%description ioctld -l pl
Wtyczka do obsługi diod LED na klawiaturze dla ekg2.

%package logsqlite
Summary:	SQLite log plugin for ekg2
Summary(pl):	Wtyczka logowania do SQLite dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description logsqlite
SQLite log plugin for ekg2.

%description logsqlite -l pl
Wtyczka logowania do bazy SQLite dla ekg2.

%package python
Summary:	Python scripting plugin for ekg2
Summary(pl):	Wtyczka języka Python dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description python
Python scripting plugin for ekg2.

%description python -l pl
Wtyczka skryptów Pythona dla ekg2.

%package voip
Summary:	GSM VoIP protocol plugin for ekg2
Summary(pl):	Wtyczka protokołu GSM VoIP dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description voip
GSM VoIP protocol plugin for ekg2.

%description voip -l pl
Wtyczka protokołu GSM VoIP dla ekg2.

%package xosd
Summary:	XOSD plugin for ekg2
Summary(pl):	Wtyczka XOSD dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}

%description xosd
XOSD plugin for ekg2.

%description xosd -l pl
Wtyczka XOSD dla ekg2.

%package -n perl-%{name}
Summary:	Perl scripting plugin for ekg2
Summary(pl):	Wtyczka języka Perl dla ekg2
Group:		Applications/Internet
Requires:	%{name}-core = %{version}-%{release}
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description -n perl-%{name}
Perl scripting plugin for ekg2.

%description -n perl-%{name} -l pl
Wtyczka skryptów Perla dla ekg2.

%prep
%setup -q -n %{name}-20070305
find . -name CVS | xargs rm -rf
%patch0 -p1
%patch1 -p1 -b .r

%build
touch ChangeLog
autoreconf -f -i
%configure \
	--disable-static \
	--enable-shared \
	--disable-rpath \
	--enable-unicode \
	--with-libgadu \
	--with-libgsm \
	--with-python \

make %{?_smp_mflags}

pushd docs/ekg2book
make
popd
pushd docs/ekg2book-en
make
popd

%install
rm -rf $RPM_BUILD_ROOT

make install \
	DESTDIR=$RPM_BUILD_ROOT

# for strip to work
find $RPM_BUILD_ROOT -name "*.so" | xargs chmod 755

mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}
mv $RPM_BUILD_ROOT%{_libexecdir}/ioctld $RPM_BUILD_ROOT%{_libexecdir}/%{name}/

cp -p README README-main
# convert docs to UTF-8
for file in \
	AUTHORS COPYING NEWS* README-main \
	docs/README docs/TODO \
	docs/events.txt docs/mouse.txt docs/sim.txt docs/themes.txt \
; do
iconv -f iso8859-2 -t utf8 -o $file.utf $file && mv $file.utf $file
done

cp -pr docs/ekg2book-en/book docs/ekg2book-en/book-en

rm $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
find $RPM_BUILD_ROOT%{perl_vendorarch} -name .packlist -o -name "*.bs" | xargs %{__rm}

rm $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files

%files core -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS COPYING NEWS* README-main docs/README
%doc docs/events.txt docs/mouse.txt docs/sim.txt docs/themes.txt
%doc docs/ekg2book/book docs/ekg2book-en/book-en
%attr(755,root,root) %{_bindir}/%{name}
%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/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/rc.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/rot13.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/sim.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/sms.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/xmsg.so
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/plugins
%{_datadir}/%{name}/*.txt
%{_datadir}/%{name}/plugins/autoresponder
%{_datadir}/%{name}/plugins/httprc_xajax
%{_datadir}/%{name}/plugins/irc
%{_datadir}/%{name}/plugins/logs
%{_datadir}/%{name}/plugins/mail
%{_datadir}/%{name}/plugins/ncurses
%{_datadir}/%{name}/plugins/rc
%{_datadir}/%{name}/plugins/sim
%{_datadir}/%{name}/plugins/sms
%{_datadir}/%{name}/plugins/xmsg
%{_datadir}/%{name}/themes

%files devel
%defattr(644,root,root,755)
%doc docs/TODO
%attr(755,root,root) %{_bindir}/%{name}-config
%{_includedir}/%{name}

%files gadu-gadu
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/gg.so
%{_datadir}/%{name}/plugins/gg

%files gtk2
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/gtk.so

%files gpg
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.so

%files jabber
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/jabber.so
%{_datadir}/%{name}/plugins/jabber

%files ioctld
%attr(755,root,root) %{_libexecdir}/%{name}/ioctld
%attr(755,root,root) %{_libdir}/%{name}/plugins/ioctld.so
%{_datadir}/%{name}/plugins/ioctld

%files logsqlite
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/logsqlite.so
%{_datadir}/%{name}/plugins/logsqlite

%files python
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
%attr(755,root,root) %{_datadir}/%{name}/scripts/*.py*

%files voip
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/gsm.so

%files xosd
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/xosd.so
%{_datadir}/%{name}/plugins/xosd

%files -n perl-%{name}
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/perl.so
%attr(755,root,root) %{_datadir}/%{name}/scripts/*.pl
%dir %{perl_vendorarch}/Ekg2
%{perl_vendorarch}/Ekg2.pm
%{perl_vendorarch}/Ekg2/Irc.pm
%dir %{perl_vendorarch}/auto/Ekg2
%attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Ekg2.so
%dir %{perl_vendorarch}/auto/Ekg2/Irc
%attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so

%changelog
* Fri May 18 2007 Dominik Mierzejewski <rpm at greysector.net> 0-0.7.20070427
- use versioned dependencies for the main package
- fix missing interpreter line in perl scripts

* Sat Apr 22 2007 Dominik Mierzejewski <rpm at greysector.net> 0-0.6.20070427
- latest available snapshot + diff to current CVS
- add unowned directory to file list
- libgsm support can be now enabled

* Mon Feb 05 2007 Dominik Mierzejewski <rpm at greysector.net> 0-0.5.20070203
- renamed python subpackage back, it's only a plugin

* Sun Feb 04 2007 Dominik Mierzejewski <rpm at greysector.net> 0-0.4.20070203
- renamed perl and python bindings packages
- added gpgme-devel BR
- added BuildConflicts: readline-devel
- removed redundant BRs
- built HTML docs
- built ncurses plugin with -fno-strict-aliasing to avoid infinite loop
  in unicode build

* Sun Feb 04 2007 Dominik Mierzejewski <rpm at greysector.net> 0-0.3.20070203
- 20070203 snapshot
- reorganized package layout
- moved ioctld to libexec/ekg2 to avoid conflict with ekg

* Mon Nov 20 2006 Dominik Mierzejewski <rpm at greysector.net> 0-0.2.20061119
- 20061119 snapshot

* Tue Sep 12 2006 Dominik Mierzejewski <rpm at greysector.net> 0-0.1.20060912
- 20060912 snapshot
- removed old cruft
- simplified subpackage names
- updated file lists
- added -devel package
- FE compliance
- disabled unicode support (doesn't work)
- simplified autotools and configure invocations
- added manpages
- converted docs to UTF-8

* Tue Oct 25 2005 Dominik Mierzejewski <rpm at greysector.net>
- fixed clean build on FC3-4

* Sun Oct 02 2005 Dominik Mierzejewski <rpm at greysector.net>
- 20051001 snapshot
- updated buildrequires for FC4
- perl scripting subpackage

* Sat May 28 2005 Dominik Mierzejewski <rpm at greysector.net>
- adapted PLD spec
- updated pl.po patch
- removed gcc4 patch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jun 2007 20:48:18 -0000	1.1
+++ .cvsignore	14 Jul 2007 15:21:35 -0000	1.2
@@ -0,0 +1,2 @@
+ekg2-20070305.tar.gz
+ekg2-20070427.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jun 2007 20:48:18 -0000	1.1
+++ sources	14 Jul 2007 15:21:35 -0000	1.2
@@ -0,0 +1,2 @@
+f0e08a598f4b4e36ee3c20731c1ea5fd  ekg2-20070305.tar.gz
+8770382268b79827349ba5693857d783  ekg2-20070427.diff.gz




More information about the scm-commits mailing list