SPECS: ekg2.spec - fixed building with yesterday_snapshot - added new plugi...

Thu Jul 17 11:00:45 CEST 2008

Author: paszczus                     Date: Thu Jul 17 09:00:45 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed building with yesterday_snapshot
- added new plugins: feed, jogger, polchat
- default using sqlite3 instead of sqlite
- changes made by Adam Mikuta <adammikuta (at) gmail (dot) com>, thanks

---- Files affected:
SPECS:
   ekg2.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: SPECS/ekg2.spec
diff -u SPECS/ekg2.spec:1.85 SPECS/ekg2.spec:1.86

--- SPECS/ekg2.spec:1.85	Tue May  6 21:44:54 2008
+++ SPECS/ekg2.spec	Thu Jul 17 11:00:39 2008
@@ -4,6 +4,7 @@
 %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
@@ -13,8 +14,8 @@
 %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}
@@ -29,15 +30,15 @@
 %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
+Release:	3.2
 Epoch:		2
 License:	GPL v2+
 Group:		Applications/Communications
@@ -49,7 +50,9 @@
 %{?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}
@@ -82,6 +85,7 @@
 %description -l pl.UTF-8
 Wieloprotokołowy, otwarty komunikator internetowy z wieloma wtyczkami.
 
+%if %{without yesterday_snapshot}
 %package devel
 Summary:	ekg2 header files
 Summary(pl.UTF-8):	Pliki nagłówkowe ekg2
@@ -93,6 +97,21 @@
 
 %description devel -l pl.UTF-8
 Pliki nagłówkowe ekg2.
+%endif
+
+%if %{with yesterday_snapshot}
+%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.
+%endif
 
 %package plugin-gpg
 Summary:	gpg plugin for ekg2
@@ -131,6 +150,20 @@
 %description plugin-ioctld -l pl.UTF-8
 Wtyczka ioctld dla ekg2 (zawiera program z ustawionym suid root!).
 
+%if %{with yesterday_snapshot}
+%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.
+%endif
+
 %package plugin-logsqlite
 Summary:	SQLite log plugin for ekg2
 Summary(pl.UTF-8):	Wtyczka logowania do SQLite dla ekg2
@@ -196,6 +229,20 @@
 %description plugin-protocol-jabber -l pl.UTF-8
 Wtyczka protokołu Jabber dla ekg2.
 
+%if %{with yesterday_snapshot}
+%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.
+%endif
+
 %package plugin-readline
 Summary:	readline interface
 Summary(pl.UTF-8):	Interfejs readline
@@ -284,7 +331,11 @@
 	%{!?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 \
@@ -341,10 +392,18 @@
 %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
@@ -364,6 +423,12 @@
 %{_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
 %defattr(644,root,root,755)
@@ -394,6 +459,12 @@
 %{_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
+
 %if %{with readline}
 %files plugin-readline
 %defattr(644,root,root,755)
@@ -442,6 +513,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2008/07/17 09:00:39  paszczus
+- fixed building with yesterday_snapshot
+- added new plugins: feed, jogger, polchat
+- default using sqlite3 instead of sqlite
+- changes made by Adam Mikuta <adammikuta (at) gmail (dot) com>, thanks
+
 Revision 1.85  2008/05/06 19:44:54  qboosh
 - don't disable optimization
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ekg2.spec?r1=1.85&r2=1.86&f=u

