rpms/ekg2/F-7 ekg2-rpm.patch, 1.1, 1.2 ekg2.spec, 1.1, 1.2 sources, 1.2, 1.3

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/ekg2/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4977

Modified Files:
	ekg2-rpm.patch ekg2.spec sources 
Log Message:
- updated to 0.1.1
- move docs charset conversion and copying around to prep
- update license tag
- fix BRs


ekg2-rpm.patch:

Index: ekg2-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-7/ekg2-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg2-rpm.patch	14 Jul 2007 15:45:53 -0000	1.1
+++ ekg2-rpm.patch	14 Feb 2008 20:40:33 -0000	1.2
@@ -86,14 +86,6 @@
  # 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 @@
@@ -101,14 +93,6 @@
  # 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 @@
@@ -123,14 +107,6 @@
  # 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 @@


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-7/ekg2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ekg2.spec	14 Jul 2007 15:45:53 -0000	1.1
+++ ekg2.spec	14 Feb 2008 20:40:33 -0000	1.2
@@ -1,20 +1,18 @@
 %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
+Version:	0.1.1
+Release:	1%{?dist}
+License:	GPLv2
 Group:		Applications/Internet
-Source0:	http://pl.ekg2.org/%{name}-20070305.tar.gz
-Patch0:		%{name}-%{_snap}.diff.gz
+Source0:	http://pl.ekg2.org/%{name}-%{version}.tar.gz
 Patch1:		%{name}-rpm.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
+BuildRequires:	automake17
 BuildRequires:	docbook-style-xsl
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
@@ -30,6 +28,7 @@
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
+BuildRequires:	perl(ExtUtils::Embed)
 BuildRequires:	python-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	xosd-devel
@@ -193,14 +192,19 @@
 Wtyczka skryptów Perla dla ekg2.
 
 %prep
-%setup -q -n %{name}-20070305
-find . -name CVS | xargs rm -rf
-%patch0 -p1
+%setup -q
 %patch1 -p1 -b .r
+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
 
 %build
-touch ChangeLog
-autoreconf -f -i
 %configure \
 	--disable-static \
 	--enable-shared \
@@ -231,16 +235,6 @@
 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
@@ -264,7 +258,6 @@
 %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
@@ -352,6 +345,12 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so
 
 %changelog
+* Thu Feb 14 2008 Dominik Mierzejewski <rpm at greysector.net> 0.1.1-1
+- updated to 0.1.1
+- move docs charset conversion and copying around to prep
+- update license tag
+- fix BRs
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2007 15:45:53 -0000	1.2
+++ sources	14 Feb 2008 20:40:33 -0000	1.3
@@ -1,2 +1 @@
-f0e08a598f4b4e36ee3c20731c1ea5fd  ekg2-20070305.tar.gz
-8770382268b79827349ba5693857d783  ekg2-20070427.diff.gz
+8c64ab909687b9ac3798caa7736d7b2a  ekg2-0.1.1.tar.gz