[ekg2] Update to v0.3.1

Fri Dec 30 13:07:23 UTC 2011

commit 4f9ebc5acf04ad173ef4f4befbe4b895db59c258
Author: Karol Trzcionka <karlik at fedoraproject.org>
Date:   Fri Dec 30 14:07:00 2011 +0100

    Update to v0.3.1

 .gitignore           |    1 +
 ekg2-gcc43.patch     |  154 --------------------------------------------------
 ekg2-gtk2-2.13.patch |   24 --------
 ekg2-rpm.patch       |  100 --------------------------------
 ekg2.spec            |   91 +++++++-----------------------
 sources              |    3 +-
 6 files changed, 23 insertions(+), 350 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index df9add3..b55300e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ekg2-0.2-rc1.tar.gz
 ekg2-gtk2-2.22.patch
+/ekg2-0.3.1.tar.gz
diff --git a/ekg2.spec b/ekg2.spec
index 2934b94..12be4e6 100644
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -4,21 +4,17 @@
 Summary:	Multi-protocol instant messaging and chat client
 Summary(pl):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
-Version:	0.2
-Release:	0.18.rc1%{?dist}
+Version:	0.3.1
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
-Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
-Patch1:		%{name}-rpm.patch
-Patch2:		%{name}-gcc43.patch
-Patch3:		%{name}-gtk2-2.13.patch
-Patch4:		%{name}-gtk2-2.22.patch
+Source0:	http://pl.ekg2.org/%{name}-%{version}.tar.gz
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
 BuildRequires:	automake17
 BuildRequires:	docbook-style-xsl
 BuildRequires:	expat-devel
-BuildRequires:	gettext-autopoint
+#BuildRequires:	gettext-autopoint
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	gnutls-devel
@@ -34,9 +30,8 @@ BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
 BuildRequires:	perl(ExtUtils::Embed)
 BuildRequires:	python-devel
-BuildRequires:	ruby ruby-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	xosd-devel
+#BuildRequires:	xosd-devel
 BuildRequires:	cvs
 BuildConflicts:	readline-devel
 Requires:	%{name}-core = %{version}-%{release}
@@ -173,18 +168,6 @@ Python scripting plugin for ekg2.
 %description python -l pl
 Wtyczka skryptów Pythona dla ekg2.
 
-%package ruby
-Summary:	Ruby scripting plugin for ekg2
-Summary(pl):	Wtyczka języka Ruby dla ekg2
-Group:		Applications/Internet
-Requires:	%{name}-core = %{version}-%{release}
-
-%description ruby
-Ruby scripting plugin for ekg2.
-
-%description ruby -l pl
-Wtyczka skryptów Ruby dla ekg2.
-
 %package voip
 Summary:	GSM VoIP protocol plugin for ekg2
 Summary(pl):	Wtyczka protokołu GSM VoIP dla ekg2
@@ -197,37 +180,22 @@ 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.
-
 %prep
-%setup -q -n %{name}-%{version}-rc1
-%patch1 -p1 -b .r
-%patch2 -p1 -b .gcc43
-%patch3 -p1 -b .gtk
-%patch4 -p1 -b .gtkdep
-cp -p README README-main
+%setup -q
 # convert docs to UTF-8
 for file in \
-	AUTHORS COPYING NEWS* README-main \
+	AUTHORS COPYING NEWS*  \
 	docs/README docs/TODO \
-	docs/events.txt docs/mouse.txt docs/sim.txt docs/themes.txt \
+	docs/events.txt docs/mouse.txt docs/sim.txt docs/themes{,-en}.txt \
+	docs/voip.txt \
 ; do
 iconv -f iso8859-2 -t utf8 -o $file.utf $file && mv $file.utf $file
 done
 
+sed -i "s/);/,\n\t'INSTALLDIRS' => 'vendor');/" plugins/perl/common/Makefile.PL
+sed -i "s/);/,\n\t'INSTALLDIRS' => 'vendor');/" plugins/perl/irc/Makefile.PL
+
 %build
-touch ChangeLog
-autoreconf -f -i
 %configure \
 	--disable-static \
 	--enable-shared \
@@ -237,7 +205,7 @@ autoreconf -f -i
 	--with-libgsm \
 	--with-python \
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 pushd docs/ekg2book
 make
@@ -267,9 +235,6 @@ find $RPM_BUILD_ROOT%{perl_vendorarch} -name .packlist -o -name "*.bs" | xargs %
 
 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
@@ -279,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files core -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS* README-main docs/README
+%doc AUTHORS COPYING NEWS* docs/README
 %doc docs/events.txt docs/mouse.txt docs/sim.txt docs/themes.txt
 %doc docs/ekg2book/book docs/ekg2book-en/book-en
 %{_bindir}/%{name}
@@ -289,6 +254,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/autoresponder.so
 %{_libdir}/%{name}/plugins/feed.so
 %{_libdir}/%{name}/plugins/httprc_xajax.so
+%{_libdir}/%{name}/plugins/icq.so
 %{_libdir}/%{name}/plugins/irc.so
 %{_libdir}/%{name}/plugins/jogger.so
 %{_libdir}/%{name}/plugins/logs.so
@@ -297,6 +263,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/pcm.so
 %{_libdir}/%{name}/plugins/polchat.so
 %{_libdir}/%{name}/plugins/rc.so
+%{_libdir}/%{name}/plugins/remote.so
+%{_libdir}/%{name}/plugins/rivchat.so
 %{_libdir}/%{name}/plugins/rot13.so
 %{_libdir}/%{name}/plugins/sim.so
 %{_libdir}/%{name}/plugins/sms.so
@@ -320,7 +288,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc docs/TODO
-%{_includedir}/%{name}
 
 %files gadu-gadu
 %defattr(-,root,root,-)
@@ -334,6 +301,7 @@ rm -rf $RPM_BUILD_ROOT
 %files gpg
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/gpg.so
+%{_datadir}/%{name}/plugins/gpg
 
 %files ioctld
 %defattr(-,root,root,-)
@@ -363,32 +331,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/python.so
 %{_datadir}/%{name}/scripts/*.py*
-
-%files ruby
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/ruby.so
+%{_datadir}/%{name}/plugins/python
 
 %files voip
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/gsm.so
 
-%files xosd
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/plugins/xosd.so
-%{_datadir}/%{name}/plugins/xosd
-
 %changelog
-* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.2-0.18.rc1
-- Rebuild for new libpng
-
-* Thu Jun 16 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.2-0.17.rc1
-- Perl mass rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-0.16.rc1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.2-0.15.rc1
-- recompiling .py files against Python 2.7 (rhbz#623291)
+* Fri Dec 30 2011 Karol Trzcionka <karlik at fedoraproject.org> - 0.3.1-1
+- Update to v0.3.1
 
 * Thu Aug 05 2010 Karol Trzcionka <karlikt at gmail.com> - 0.2-0.14.rc1
 - Fix build with new gtk2
diff --git a/sources b/sources
index 209dc41..e06fcf9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7ef64a54c8bbca927f8eccc9b10c9edd  ekg2-0.2-rc1.tar.gz
-64503ebff041eb581cf18a4fa9542053  ekg2-gtk2-2.22.patch
+68fc05b432c34622df6561eaabef5a40  ekg2-0.3.1.tar.gz
