X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ekg2.spec;h=59675281b6c771678282a59067e9bafc7606e9fc;hb=ba6bbffe2b887ee659da569559af0b4178275943;hp=850fe8e8cde94fe193d529ccc5218df9275acc4e;hpb=838f44dc71ee688498108fdb495fabc46c297082;p=packages%2Fekg2.git

diff --git a/ekg2.spec b/ekg2.spec
index 850fe8e..5967528 100644
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -1,8 +1,7 @@
 #
 # 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
 %bcond_without	gpg			# don't build gpg plugin
 %bcond_without	gtk			# don't build gtk plugin
@@ -12,49 +11,48 @@
 %bcond_without	perl			# don't build Perl plugin
 %bcond_without	python			# don't build Python plugin
 %bcond_without	readline		# don't build readline interface
-%bcond_without	sqlite			# don't build logsqlite plugin based on sqlite (conflicts with sqlite3)
-%bcond_with	sqlite3			# build logsqlite plugin based on sqlite3
+%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
 
-%if %{with yesterday_snapshot}
-%define		_snap %(date +%%Y%%m%%d -d yesterday)
-%define		_ver 0.0.%{_snap}
-%else
-%define		_snap 0.1.1
-%define		_ver 0.1.1
-%endif
+# Please, test all modules before updating. If you want just try new version,
+# use DEVEL branch.
+%define		_snap 20090511
 
 %if %{without jabber}
 %undefine with_gnutls
 %endif
 
-%if %{with sqlite3}
-%undefine sqlite
+%if %{with sqlite}
+%undefine sqlite3
 %endif
 
 Summary:	Multi-protocol instant messaging and chat client
 Summary(pl.UTF-8):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
-Version:	%{_ver}
-Release:	3.1
+Version:	0.1.3
+Release:	0.%{_snap}.1
 Epoch:		2
 License:	GPL v2+
 Group:		Applications/Communications
-Source0:	http://pl.ekg2.org/%{name}-%{_snap}.tar.gz
-# Source0-md5:	8c64ab909687b9ac3798caa7736d7b2a
+Source0:	http://pl.ekg2.org/%{name}-%{_snap}.tar.bz2
+# Source0-md5:	053be64c441d08cb719bf8267faba6f1
 Patch0:		%{name}-perl-install.patch
-#Patch1:		%{name}-no_scripts.patch
+Patch1:		%{name}-missing-xwcslen.patch
+Patch2:		%{name}-gtk.patch
 URL:		http://ekg2.org/
 %{?with_aspell:BuildRequires:	aspell-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_jabber:BuildRequires:	expat-devel}
+%if %{with feed} || %{with jabber}
+BuildRequires:	expat-devel
+%endif
 BuildRequires:	gettext-devel
 %{?with_gadugadu:BuildRequires:	giflib-devel}
 %{?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}
@@ -93,6 +91,18 @@ Header files for ekg2.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe ekg2.
 
+%package plugin-feed
+Summary:	feed plugin for ekg2
+Summary(pl.UTF-8):	Wtyczka feed dla ekg2
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-feed
+feed plugin for ekg2.
+
+%description plugin-feed -l pl.UTF-8
+Wtyczka feed dla ekg2.
+
 %package plugin-gpg
 Summary:	gpg plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka gpg dla ekg2
@@ -110,7 +120,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.
@@ -130,6 +140,18 @@ Ioctld plugin for ekg2 (contains suid root binary!).
 %description plugin-ioctld -l pl.UTF-8
 Wtyczka ioctld dla ekg2 (zawiera program z ustawionym suid root!).
 
+%package plugin-jogger
+Summary:	Jogger plugin for ekg2
+Summary(pl.UTF-8):	Wtyczka jogger dla ekg2
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-jogger
+Jogger plugin for ekg2.
+
+%description plugin-jogger -l pl.UTF-8
+Wtyczka jogger dla ekg2.
+
 %package plugin-logsqlite
 Summary:	SQLite log plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka logowania do SQLite dla ekg2
@@ -171,6 +193,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
@@ -195,6 +229,30 @@ Jabber protocol plugin for ekg2.
 %description plugin-protocol-jabber -l pl.UTF-8
 Wtyczka protokołu Jabber dla ekg2.
 
+%package plugin-protocol-polchat
+Summary:	Polchat protocol plugin for ekg2
+Summary(pl.UTF-8):	Wtyczka protokołu polchat dla ekg2
+Group:		Applications/Communications
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-protocol-polchat
+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
@@ -258,7 +316,9 @@ Wtyczka xosd dla ekg2.
 %prep
 %setup -q -n %{name}-%{_snap}
 %patch0 -p1
-#%patch1 -p1
+#%%patch1 -p1
+%patch2 -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
 
@@ -274,6 +334,8 @@ cd ..
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# for hostent.h_addr (should be in CPPFLAGS, but it's overridden in plugins/jabber)
+CFLAGS="%{rpmcflags} -D_GNU_SOURCE"
 %configure \
 	--enable-unicode \
 	--with%{!?with_aspell:out}-aspell \
@@ -281,7 +343,11 @@ cd ..
 	%{!?with_gpg:--without-gpg} \
 	--with%{!?with_gtk:out}-gtk \
 	--with%{!?with_gnutls:out}-libgnutls \
-	--with%{!?with_jabber:out}-expat \
+%if %{with feed} || %{with jabber}
+		--with-expat \
+%else
+		--without-expat \
+%endif
 	--with%{!?with_libgsm:out}-libgsm \
 	%{!?with_perl:--without-perl} \
 	--with%{!?with_python:out}-python \
@@ -290,8 +356,7 @@ cd ..
 	--with%{!?with_sqlite3:out}-sqlite3 \
 	--with%{!?with_xosd:out}-xosd
 
-%{__make} \
-	CFLAGS="-D_GNU_SOURCE"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -339,10 +404,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/scripts
 %{_datadir}/%{name}/themes
 
-%files devel
+%files plugin-feed
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ekg2-config
-%{_includedir}/ekg2
+%attr(755,root,root) %{_libdir}/%{name}/plugins/feed.so
 
 %if %{with gpg}
 %files plugin-gpg
@@ -362,6 +426,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/ioctld
 %attr(4755,root,root) %{_libexecdir}/ioctld
 
+%files plugin-jogger
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/jogger.so
+
 %if %{with sqlite} || %{with sqlite3}
 %files plugin-logsqlite
 %defattr(644,root,root,755)
@@ -380,6 +448,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
@@ -392,6 +464,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/jabber
 %endif
 
+%files plugin-protocol-polchat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/polchat.so
+
+%files plugin-protocol-rivchat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/rivchat.so
+
 %if %{with readline}
 %files plugin-readline
 %defattr(644,root,root,755)