X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ekg2.spec;h=688c2b60b41ec019d914ded9bb3dc24d809fb803;hb=445155acf648f56d6ebcb7abd4cd99380282cc26;hp=79b217cf249dccbb15261f7c6f0f98a366e71a87;hpb=e30c3f0bb91f156fd3a247960734ea10db3800a8;p=packages%2Fekg2.git

diff --git a/ekg2.spec b/ekg2.spec
index 79b217c..688c2b6 100644
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -1,7 +1,10 @@
+# TODO:
+# - warning: Installed (but unpackaged) file(s) found:
+#   /usr/lib/perl5/5.10.0/i686-pld-linux-thread-multi/perllocal.pod
+#   /usr/lib/perl5/vendor_perl/5.10.0/i686-pld-linux-thread-multi/auto/Ekg2/.packlist
+#   /usr/lib/perl5/vendor_perl/5.10.0/i686-pld-linux-thread-multi/auto/Ekg2/Irc/.packlist
 #
 # Conditional build:
-%bcond_with	yesterday_snapshot	# Build most current ekg2 snapshot
-					# (must use ./builder -n5 or plain rpmbuild)
 %bcond_without	aspell			# build without spell-checking support with aspell
 %bcond_without	feed			# don't build feed plugin
 %bcond_without	gadugadu		# don't build gg plugin
@@ -16,20 +19,15 @@
 %bcond_with	sqlite			# build logsqlite plugin based on sqlite (conflicts with sqlite3)
 %bcond_without	sqlite3			# don't build logsqlite plugin based on sqlite3
 %bcond_without	xosd			# don't build xosd plugin
+%bcond_with	git			# checkout svn trunk instead of Source0 - requested by ekg2 developer
 
-%if %{without yesterday_snapshot}
-%define		_snap 0.1.1
-%define		_ver 0.1.1
-%define		_tarballformat gz
+%if %{with git}
+%define		subver git.%(date +%Y%m%d)
 %else
-%define		_snap %(date +%%Y%%m%%d -d yesterday)
-%define		_ver 0.0.%{_snap}
-%define		_tarballformat bz2
+%define		subver 20101210
 %endif
 
-%if %{without jabber}
-%undefine with_gnutls
-%endif
+%define		rel 3
 
 %if %{with sqlite}
 %undefine sqlite3
@@ -38,15 +36,18 @@
 Summary:	Multi-protocol instant messaging and chat client
 Summary(pl.UTF-8):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
-Version:	%{_ver}
-Release:	4
-Epoch:		2
+Version:	0.4
+Release:	0.%{subver}.%{rel}
+Epoch:		1
 License:	GPL v2+
 Group:		Applications/Communications
-Source0:	http://pl.ekg2.org/%{name}-%{_snap}.tar.%{_tarballformat}
-# Source0-md5:	8c64ab909687b9ac3798caa7736d7b2a
+%if %{without git}
+Source0:	https://github.com/leafnode/ekg2/tarball/master#/%{name}-%{subver}.tar.bz2
+# Source0-md5:	240c7203a2b8c15557710dcbc8fbf8c6
+%endif
 Patch0:		%{name}-perl-install.patch
-#Patch1:	%{name}-no_scripts.patch
+Patch1:		%{name}-gtk.patch
+Patch2:		%{name}-bug-63.patch
 URL:		http://ekg2.org/
 %{?with_aspell:BuildRequires:	aspell-devel}
 BuildRequires:	autoconf
@@ -54,12 +55,13 @@ BuildRequires:	automake
 %if %{with feed} || %{with jabber}
 BuildRequires:	expat-devel
 %endif
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel >= 0.17-8
 %{?with_gadugadu:BuildRequires:	giflib-devel}
+%{?with_git:BuildRequires:	git-core}
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 1.2.5}
 %{?with_gpg:BuildRequires:	gpgme-devel}
 BuildRequires:	gpm-devel
-%{?with_gtk:BuildRequires:	gtk+2-devel}
+%{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.14.1}
 %{?with_gadugadu:BuildRequires:	libgadu-devel}
 %{?with_libgsm:BuildRequires:	libgsm-devel}
 %{?with_gadugadu:BuildRequires:	libjpeg-devel}
@@ -71,7 +73,6 @@ BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig
 %{?with_python:BuildRequires:	python-devel}
 %{?with_readline:BuildRequires:	readline-devel}
-%{?with_perl:BuildRequires:	rpm-perlprov}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
@@ -127,7 +128,7 @@ Summary:	gtk plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka gtk dla ekg2
 Group:		Applications/Communications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk+2
+Requires:	gtk+2 >= 2:2.14.1
 
 %description plugin-gtk
 gtk plugin for ekg2.
@@ -200,6 +201,18 @@ GSM VoIP protocol plugin for ekg2.
 %description plugin-protocol-gsm -l pl.UTF-8
 Wtyczka protokołu GSM VoIP dla ekg2.
 
+%package plugin-protocol-icq
+Summary:	ICQ protocol plugin for ekg2
+Summary(pl.UTF-8):	Wtyczka protokołu ICQ dla ekg2
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-protocol-icq
+ICQ protocol plugin for ekg2.
+
+%description plugin-protocol-icq -l pl.UTF-8
+Wtyczka protokołu ICQ dla ekg2.
+
 %package plugin-protocol-irc
 Summary:	IRC protocol plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka protokołu IRC dla ekg2
@@ -213,16 +226,16 @@ IRC protocol plugin for ekg2.
 Wtyczka protokołu IRC dla ekg2.
 
 %package plugin-protocol-jabber
-Summary:	Jabber protocol plugin for ekg2
-Summary(pl.UTF-8):	Wtyczka protokołu Jabber dla ekg2
+Summary:	Jabber and Tlen protocols plugin for ekg2
+Summary(pl.UTF-8):	Wtyczka protokołów Jabber i Tlen dla ekg2
 Group:		Applications/Communications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-protocol-jabber
-Jabber protocol plugin for ekg2.
+Jabber and Tlen protocols plugin for ekg2.
 
 %description plugin-protocol-jabber -l pl.UTF-8
-Wtyczka protokołu Jabber dla ekg2.
+Wtyczka protokołów Jabber i Tlen dla ekg2.
 
 %package plugin-protocol-polchat
 Summary:	Polchat protocol plugin for ekg2
@@ -236,6 +249,18 @@ Polchat protocol plugin for ekg2.
 %description plugin-protocol-polchat -l pl.UTF-8
 Wtyczka protokołu polchat dla ekg2.
 
+%package plugin-protocol-rivchat
+Summary:	Rivchat protocol plugin for ekg2
+Summary(pl.UTF-8):	Wtyczka protokołu rivchat dla ekg2
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-protocol-rivchat
+Rivchat protocol plugin for ekg2.
+
+%description plugin-protocol-rivchat -l pl.UTF-8
+Wtyczka protokołu rivchat dla ekg2.
+
 %package plugin-readline
 Summary:	readline interface
 Summary(pl.UTF-8):	Interfejs readline
@@ -248,6 +273,18 @@ readline interface.
 %description plugin-readline -l pl.UTF-8
 Interfejs readline.
 
+%package plugin-remote
+Summary:	Remote contol interface
+Summary(pl.UTF-8):	Zdalne sterowanie ekg2
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-remote
+Remote control interface.
+
+%description plugin-remote -l pl.UTF-8
+Zdalne sterowanie ekg2.
+
 %package plugin-scripting-perl
 Summary:	Perl scripting plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka języka Perl dla ekg2
@@ -265,6 +302,7 @@ Summary:	Python scripting plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka języka Python dla ekg2
 Group:		Applications/Communications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	python-modules
 
 %description plugin-scripting-python
 Python scripting plugin for ekg2.
@@ -297,24 +335,41 @@ xosd plugin for ekg2.
 Wtyczka xosd dla ekg2.
 
 %prep
-%setup -q -n %{name}-%{_snap}
+%if %{with git}
+%setup -q -T -c -n %{name}-%{subver}
+repo="%ekg2repo"
+branch="%ekg2branch"
+if [ "$repo" = "%%ekg2repo" ]; then
+repo="git://github.com/leafnode/ekg2.git"
+fi
+if [ "$branch" = "%%ekg2branch" ]; then
+repo="master"
+fi
+git init
+git fetch $repo $branch
+git checkout FETCH_HEAD
+%else
+%setup -q -c -n %{name}-%{subver}
+mv leafnode-ekg2-*/* .
+%endif
+
 %patch0 -p1
-#%patch1 -p1
-sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac
-sed -i -e '\#/opt/sqlite/lib#s#"$# /usr/lib64"#' m4/sqlite.m4
+%patch1 -p1
+%patch2 -p0
+
+sed -i -e '\#/opt/sqlite/lib#s#"$# %{_libdir}"#' m4/sqlite.m4
+
+touch po/Makefile.in.in
+find -name *.c > po/POTFILES.in
 
 %build
-%{__libtoolize} --ltdl
-cd libltdl
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cd ..
+%{__gettextize}
+%{__libtoolize}
 %{__aclocal} -I m4
-%{__autoconf}
 %{__autoheader}
 %{__automake}
+%{__autoconf}
+
 # for hostent.h_addr (should be in CPPFLAGS, but it's overridden in plugins/jabber)
 CFLAGS="%{rpmcflags} -D_GNU_SOURCE"
 %configure \
@@ -346,8 +401,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f README README-main || true
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
 
 %find_lang %{name}
@@ -357,7 +410,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS* README-main docs/ekg2book* docs/README docs/TODO docs/*.txt
+%doc NEWS* README.md docs/ekg2book* docs/README docs/TODO docs/*.txt
 %attr(755,root,root) %{_bindir}/ekg2
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
@@ -385,23 +438,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/scripts
 %{_datadir}/%{name}/themes
 
-%if %{without yesterday_snapshot}
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ekg2-config
-%{_includedir}/ekg2
-%endif
-
-%if %{with yesterday_snapshot}
 %files plugin-feed
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/feed.so
-%endif
 
 %if %{with gpg}
 %files plugin-gpg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.so
+%{_datadir}/ekg2/plugins/gpg/commands-en.txt
+%{_datadir}/ekg2/plugins/gpg/commands-pl.txt
 %endif
 
 %if %{with gtk}
@@ -416,11 +462,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/ioctld
 %attr(4755,root,root) %{_libexecdir}/ioctld
 
-%if %{with yesterday_snapshot}
 %files plugin-jogger
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/jogger.so
-%endif
 
 %if %{with sqlite} || %{with sqlite3}
 %files plugin-logsqlite
@@ -440,6 +484,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gsm.so
 %endif
 
+%files plugin-protocol-icq
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/icq.so
+
 %files plugin-protocol-irc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/irc.so
@@ -452,11 +500,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/jabber
 %endif
 
-%if %{with yesterday_snapshot}
 %files plugin-protocol-polchat
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/polchat.so
-%endif
+
+%files plugin-protocol-rivchat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/rivchat.so
 
 %if %{with readline}
 %files plugin-readline
@@ -465,6 +515,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/readline
 %endif
 
+%if %{with readline}
+%files plugin-remote
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/remote.so
+%endif
+
 %if %{with perl}
 %files plugin-scripting-perl
 %defattr(644,root,root,755)
@@ -486,6 +542,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
 %{_datadir}/%{name}/scripts/*.py
+%dir %{_datadir}/ekg2/plugins/python
+%{_datadir}/ekg2/plugins/python/commands-en.txt
+%{_datadir}/ekg2/plugins/python/commands-pl.txt
 %endif
 
 %files plugin-sim