- updated to snap 20070113,

- added gpg, httprc_xajax, rot13 and xmsg plugins,
- added GIF token OCR support for gg plugin,
- BR: zlib-devel (for log plugin),
- added conditional --without-perl configure option,
- fixed %install section for docs (doesn't break --short-circuit anymore),
- added themes, sorted bconds, BRs, subpackages, configure options, file lists

Changed files:
    ekg2.spec -> 1.74

diff --git a/ekg2.spec b/ekg2.spec
index 539bff9f1f284d5c9df3ad867ed2e15a35a0bb18..d57b297a72eba6c2409c027ce90dfd1674d25948 100644 (file)
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -4,21 +4,22 @@
                                        # (must use ./builder -n5 or plain rpmbuild)
 %bcond_without aspell                  # build without spell-checking support with aspell
 %bcond_without gadugadu                # don't build gg plugin
+%bcond_without  gpg                    # don't build gpg plugin
+%bcond_without  gtk                    # don't build gtk plugin
 %bcond_without jabber                  # don't build jabber plugin
 %bcond_without gnutls                  # build jabber plugin without libgnutls
 %bcond_without libgsm                  # don't build libgsm plugin
-%bcond_without python                  # don't build Python plugin
 %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_without xosd                    # don't build xosd plugin
-%bcond_without  gtk                    # don't build gtk plugin
 
 %if %{with yesterday_snapshot}
 %define                _snap %(date +%%Y%%m%%d -d yesterday)
 %else
-%define                _snap 20060831
+%define                _snap 20070113
 %endif
 
 %if !%{with jabber}
@@ -47,12 +48,14 @@ BuildRequires:      autoconf
 BuildRequires: automake
 %{?with_jabber:BuildRequires:  expat-devel}
 BuildRequires: gettext-devel
+%{?with_gadugadu:BuildRequires:        giflib-devel}
+%{?with_gadugadu:BuildRequires:        libgadu-devel}
+%{?with_gadugadu:BuildRequires:        libjpeg-devel}
 %{?with_gnutls:BuildRequires:  gnutls-devel >= 1.2.5}
+%{?with_gpg:BuildRequires:     gpgme-devel}
 BuildRequires: gpm-devel
 %{?with_gtk:BuildRequires:     gtk+2-devel}
-%{?with_gadugadu:BuildRequires:        libgadu-devel}
 %{?with_libgsm:BuildRequires:  libgsm-devel}
-%{?with_gadugadu:BuildRequires:        libjpeg-devel}
 BuildRequires: libltdl-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
@@ -61,13 +64,13 @@ BuildRequires:      pkgconfig
 %{?with_python:BuildRequires:  python-devel}
 %{?with_python:BuildRequires:  rpm-pythonprov}
 %{?with_perl:BuildRequires:    perl-devel}
-%{?with_readline:BuildRequires:        readline-devel}
 %{?with_perl:BuildRequires:    rpm-perlprov}
+%{?with_readline:BuildRequires:        readline-devel}
 BuildRequires: sed >= 4.0
-%{?with_xosd:BuildRequires:    xosd-devel}
 %{?with_sqlite:BuildRequires:  sqlite-devel}
 %{?with_sqlite3:BuildRequires: sqlite3-devel}
-%{?with_gtk:BuildRequires:     gtk+2-devel}
+%{?with_xosd:BuildRequires:    xosd-devel}
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -76,6 +79,72 @@ Multi-protocol instant messaging and chat client with many plugins.
 %description -l pl
 Wieloprotoko³owy, otwarty komunikator internetowy z wieloma pluginami.
 
+%package devel
+Summary:       ekg2 header files
+Summary(pl):   Pliki nag³ówkowe ekg2
+Group:         Development/Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Header files for ekg2.
+
+%description devel -l pl
+Pliki nag³ówkowe ekg2.
+
+%package plugin-gpg
+Summary:       gpg plugin for ekg2
+Summary(pl):   Wtyczka gpg dla ekg2
+Group:         Applications/Communications
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-gpg
+gpg plugin for ekg2.
+
+%description plugin-gpg -l pl
+Wtyczka gpg dla ekg2.
+
+%package plugin-gtk
+Summary:       gtk plugin for ekg2
+Summary(pl):   Wtyczka gtk dla ekg2
+Group:         Applications/Communications
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      gtk+2
+
+%description plugin-gtk
+gtk plugin for ekg2.
+
+%description plugin-gtk -l pl
+Wtyczka gtk dla ekg2.
+
+%package plugin-ioctld
+Summary:       Ioctld plugin for ekg2
+Summary(pl):   Wtyczka ioctld dla ekg2
+Group:         Applications/Communications
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description plugin-ioctld
+Ioctld plugin for ekg2 (contains suid root binary!).
+
+%description plugin-ioctld -l pl
+Plugin ioctld dla ekg2 (zawiera program z ustawionym suid root!).
+
+%package plugin-logsqlite
+Summary:       SQLite log plugin for ekg2
+Summary(pl):   Wtyczka logowania do SQLite dla ekg2
+Group:         Applications/Communications
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+%if %{with sqlite3}
+Requires:      sqlite3
+%else
+Requires:      sqlite
+%endif
+
+%description plugin-logsqlite
+SQLite log plugin for ekg2.
+
+%description plugin-logsqlite -l pl
+Wtyczka logowania do bazy SQLite dla ekg2.
+
 %package plugin-protocol-gg
 Summary:       Gadu-gadu protocol plugin for ekg2
 Summary(pl):   Wtyczka protoko³u Gadu-gadu dla ekg2
@@ -124,17 +193,17 @@ Jabber protocol plugin for ekg2.
 %description plugin-protocol-jabber -l pl
 Wtyczka protoko³u Jabber dla ekg2.
 
-%package plugin-scripting-python
-Summary:       Python scripting plugin for ekg2
-Summary(pl):   Wtyczka jêzyka Python dla ekg2
+%package plugin-readline
+Summary:       readline interface
+Summary(pl):   Interfejs readline
 Group:         Applications/Communications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
-%description plugin-scripting-python
-Python scripting plugin for ekg2.
+%description plugin-readline
+readline interface.
 
-%description plugin-scripting-python -l pl
-Wtyczka skryptów Pythona dla ekg2.
+%description plugin-readline -l pl
+Interfejs readline.
 
 %package plugin-scripting-perl
 Summary:       Perl scripting plugin for ekg2
@@ -148,46 +217,17 @@ Python scripting Perl for ekg2.
 %description plugin-scripting-perl -l pl
 Wtyczka skryptów Perla dla ekg2.
 
-%package plugin-ioctld
-Summary:       Ioctld plugin for ekg2
-Summary(pl):   Wtyczka ioctld dla ekg2
-Group:         Applications/Communications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description plugin-ioctld
-Ioctld plugin for ekg2 (contains suid root binary!).
-
-%description plugin-ioctld -l pl
-Plugin ioctld dla ekg2 (zawiera program z ustawionym suid root!).
-
-%package plugin-logsqlite
-Summary:       SQLite log plugin for ekg2
-Summary(pl):   Wtyczka logowania do SQLite dla ekg2
-Group:         Applications/Communications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-%if %{with sqlite3}
-Requires:      sqlite3
-%else
-Requires:      sqlite
-%endif
-
-%description plugin-logsqlite
-SQLite log plugin for ekg2.
-
-%description plugin-logsqlite -l pl
-Wtyczka logowania do bazy SQLite dla ekg2.
-
-%package plugin-readline
-Summary:       readline interface
-Summary(pl):   Interfejs readline
+%package plugin-scripting-python
+Summary:       Python scripting plugin for ekg2
+Summary(pl):   Wtyczka jêzyka Python dla ekg2
 Group:         Applications/Communications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
-%description plugin-readline
-readline interface.
+%description plugin-scripting-python
+Python scripting plugin for ekg2.
 
-%description plugin-readline -l pl
-Interfejs readline.
+%description plugin-scripting-python -l pl
+Wtyczka skryptów Pythona dla ekg2.
 
 %package plugin-sim
 Summary:       Encryption plugin for ekg2
@@ -213,31 +253,6 @@ xosd plugin for ekg2.
 %description plugin-xosd -l pl
 Wtyczka xosd dla ekg2.
 
-%package plugin-gtk
-Summary:       gtk plugin for ekg2
-Summary(pl):   Wtyczka gtk dla ekg2
-Group:         Applications/Communications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      gtk+2
-
-%description plugin-gtk
-gtk plugin for ekg2.
-
-%description plugin-gtk -l pl
-Wtyczka gtk dla ekg2.
-
-%package devel
-Summary:       ekg2 header files
-Summary(pl):   Pliki nag³ówkowe ekg2
-Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description devel
-Header files for ekg2.
-
-%description devel -l pl
-Pliki nag³ówkowe ekg2.
-
 %prep
 %setup -q -n %{name}-%{_snap}
 %patch0 -p1
@@ -259,16 +274,18 @@ cd ..
 %{__automake}
 %configure \
        --with%{!?with_aspell:out}-aspell \
-       --with%{!?with_jabber:out}-expat \
-       --with%{!?with_gnutls:out}-libgnutls \
        --with%{!?with_gadugadu:out}-libgadu \
+       %{!?with_gpg:--without-gpg} \
+       --with%{!?with_gtk:out}-gtk \
+       --with%{!?with_gnutls:out}-libgnutls \
+       --with%{!?with_jabber:out}-expat \
        --with%{!?with_libgsm:out}-libgsm \
+       %{!?with_perl:--without-perl} \
        --with%{!?with_python:out}-python \
        --with%{!?with_readline:out}-readline \
-       --with%{!?with_xosd:out}-xosd \
        --with%{!?with_sqlite:out}-sqlite \
        --with%{!?with_sqlite3:out}-sqlite3 \
-       --with%{!?with_gtk:out}-gtk
+       --with%{!?with_xosd:out}-xosd
 
 %{__make}
 
@@ -279,8 +296,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf docs/{CVS,.cvsignore,Makefile*}
-mv -f README README-main
+mv -f README README-main || true
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
 
@@ -291,24 +307,59 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS* README-main docs/*
+%doc NEWS* README-main docs/ekg2book* docs/README docs/TODO docs/*.txt
 %attr(755,root,root) %{_bindir}/ekg2
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins/httprc_xajax.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/logs.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/mail.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/ncurses.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/pcm.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/rc.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/rot13.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/sms.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/xmsg.so
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/*.txt
-%{_datadir}/%{name}/plugins/rc
-%{_datadir}/%{name}/plugins/sms
+%{_datadir}/%{name}/plugins/httprc_xajax
 %{_datadir}/%{name}/plugins/logs
 %{_datadir}/%{name}/plugins/ncurses
+%{_datadir}/%{name}/plugins/rc
+%{_datadir}/%{name}/plugins/sms
 %dir %{_datadir}/%{name}/scripts
+%{_datadir}/%{name}/themes
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ekg2-config
+%{_includedir}/ekg2
+
+%if %{with gpg}
+%files plugin-gpg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.so
+%endif
+
+%if %{with gtk}
+%files plugin-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/gtk.so
+%endif
+
+%files plugin-ioctld
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/ioctld.so
+%{_datadir}/%{name}/plugins/ioctld
+%attr(4755,root,root) %{_libexecdir}/ioctld
+
+%if %{with sqlite} || %{with sqlite3}
+%files plugin-logsqlite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/plugins/logsqlite.so
+%{_datadir}/%{name}/plugins/logsqlite
+%endif
 
 %files plugin-protocol-gg
 %defattr(644,root,root,755)
@@ -333,11 +384,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/jabber
 %endif
 
-%if %{with python}
-%files plugin-scripting-python
+%if %{with readline}
+%files plugin-readline
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
-#%{_datadir}/%{name}/scripts/*.py
+%attr(755,root,root) %{_libdir}/%{name}/plugins/readline.so
+%{_datadir}/%{name}/plugins/readline
 %endif
 
 %if %{with perl}
@@ -356,24 +407,11 @@ rm -rf $RPM_BUILD_ROOT
 #%{_datadir}/%{name}/scripts/*.pl
 %endif
 
-%files plugin-ioctld
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/ioctld.so
-%{_datadir}/%{name}/plugins/ioctld
-%attr(4755,root,root) %{_libexecdir}/ioctld
-
-%if %{with sqlite} || %{with sqlite3}
-%files plugin-logsqlite
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/logsqlite.so
-%{_datadir}/%{name}/plugins/logsqlite
-%endif
-
-%if %{with readline}
-%files plugin-readline
+%if %{with python}
+%files plugin-scripting-python
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/readline.so
-%{_datadir}/%{name}/plugins/readline
+%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
+#%{_datadir}/%{name}/scripts/*.py
 %endif
 
 %files plugin-sim
@@ -387,14 +425,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/plugins/xosd.so
 %{_datadir}/%{name}/plugins/xosd
 %endif
-
-%if %{with gtk}
-%files plugin-gtk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gtk.so
-%endif
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ekg2-config
-%{_includedir}/ekg2