- sorted deps and subpackages, no need to bcond preambles

Changed files:
    ekg2.spec -> 1.45

diff --git a/ekg2.spec b/ekg2.spec
index c53ed2553a9ac46e692ec65bdf1aae385fdb0799..b00290c41fb90e869e196958f59afb6095d27062 100644 (file)
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -2,13 +2,13 @@
 # Conditional build:
 %bcond_with    yesterday_snapshot      # Build most current ekg2 snapshot
                                        # (must use ./builder -n5 or plain rpmbuild)
-%bcond_without gadugadu                # Don't build gg plugin
-%bcond_without jabber                  # Don't build jabber plugin
-%bcond_without aspell                  # Don't build in spell-checking support with aspell
-%bcond_without sqlite                  # Don't build logsqlite plugin
-%bcond_without python                  # Don't build Python plugin
-%bcond_without libgsm                  # Don't build libgsm plugin
-%bcond_without xosd                    # Don't build xosd plugin
+%bcond_without aspell                  # build without spell-checking support with aspell
+%bcond_without gadugadu                # don't build gg plugin
+%bcond_without jabber                  # don't build jabber plugin
+%bcond_without libgsm                  # don't build libgsm plugin
+%bcond_without python                  # don't build Python plugin
+%bcond_without sqlite                  # don't build logsqlite plugin
+%bcond_without xosd                    # don't build xosd plugin
 
 %if %{with yesterday_snapshot}
 %define                _snap %(date +%%Y%%m%%d -d yesterday)
@@ -27,23 +27,23 @@ Group:              Applications/Communications
 Source0:       http://www.ekg2.org/archive/%{name}-%{_snap}.tar.gz
 # Source0-md5: 66c87ecef5a4643ee364544201b32dc3
 URL:           http://www.ekg2.org/
+%{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: autoconf
 BuildRequires: automake
+%{?with_jabber:BuildRequires:  expat-devel}
 BuildRequires: gettext-devel
+%{?with_jabber:BuildRequires:  gnutls-devel >= 1.0.0}
 BuildRequires: gpm-devel
+%{?with_gadugadu:BuildRequires:        libgadu-devel}
+%{?with_libgsm:BuildRequires:  libgsm-devel}
+%{?with_gadugadu:BuildRequires:        libjpeg-devel}
 BuildRequires: libltdl-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 0.9.7d
+%{?with_python:BuildRequires:  python-devel}
 BuildRequires: sed >= 4.0
-%{?with_gadugadu:BuildRequires:        libgadu-devel}
-%{?with_gadugadu:BuildRequires:        libjpeg-devel}
-%{?with_jabber:BuildRequires:  expat-devel}
-%{?with_jabber:BuildRequires:  gnutls-devel >= 1.0.0}
-%{?with_aspell:BuildRequires:  aspell-devel}
 %{?with_sqlite:BuildRequires:  sqlite-devel}
-%{?with_python:BuildRequires:  python-devel}
-%{?with_libgsm:BuildRequires:  libgsm-devel}
 %{?with_xosd:BuildRequires:    xosd-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,7 +53,6 @@ Multi-protocol instant messaging and chat client with many plugins.
 %description -l pl
 Wieloprotoko³owy, otwarty komunikator internetowy z wieloma pluginami.
 
-%if %{with gadugadu}
 %package plugin-protocol-gg
 Summary:       Gadu-gadu protocol plugin for ekg2
 Summary(pl):   Wtyczka protoko³u Gadu-gadu dla ekg2
@@ -65,22 +64,18 @@ Gadu-gadu protocol plugin for ekg2.
 
 %description plugin-protocol-gg -l pl
 Wtyczka protoko³u gadu-gadu dla ekg2.
-%endif
 
-%if %{with jabber}
-%package plugin-protocol-jabber
-Summary:       Jabber protocol plugin for ekg2
-Summary(pl):   Wtyczka protoko³u Jabber dla ekg2
+%package plugin-protocol-gsm
+Summary:       GSM VoIP protocol plugin for ekg2
+Summary(pl):   Wtyczka protoko³u GSM VoIP dla ekg2
 Group:         Applications/Communications
 Requires:      %{name} = %{version}-%{release}
 
-%description plugin-protocol-jabber
-Jabber protocol plugin for ekg2.
-
-%description plugin-protocol-jabber -l pl
-Wtyczka protoko³u Jabber dla ekg2.
-%endif
+%description plugin-protocol-gsm
+GSM VoIP protocol plugin for ekg2.
 
+%description plugin-protocol-gsm -l pl
+Wtyczka protoko³u GSM VoIP dla ekg2.
 
 %package plugin-protocol-irc
 Summary:       IRC protocol plugin for ekg2
@@ -94,23 +89,18 @@ IRC protocol plugin for ekg2.
 %description plugin-protocol-irc -l pl
 Wtyczka protoko³u IRC dla ekg2.
 
-
-%if %{with libgsm}
-%package plugin-protocol-gsm
-Summary:       GSM VoIP protocol plugin for ekg2
-Summary(pl):   Wtyczka protoko³u GSM VoIP dla ekg2
+%package plugin-protocol-jabber
+Summary:       Jabber protocol plugin for ekg2
+Summary(pl):   Wtyczka protoko³u Jabber dla ekg2
 Group:         Applications/Communications
 Requires:      %{name} = %{version}-%{release}
 
-%description plugin-protocol-gsm
-GSM VoIP protocol plugin for ekg2.
-
-%description plugin-protocol-gsm -l pl
-Wtyczka protoko³u GSM VoIP dla ekg2.
-%endif
+%description plugin-protocol-jabber
+Jabber protocol plugin for ekg2.
 
+%description plugin-protocol-jabber -l pl
+Wtyczka protoko³u Jabber dla ekg2.
 
-%if %{with python}
 %package plugin-scripting-python
 Summary:       Python scripting plugin for ekg2
 Summary(pl):   Wtyczka jêzyka Python dla ekg2
@@ -122,21 +112,6 @@ Python scripting plugin for ekg2.
 
 %description plugin-scripting-python -l pl
 Wtyczka skryptów Pythona dla ekg2.
-%endif
-
-
-%package plugin-sim
-Summary:       Encryption plugin for ekg2
-Summary(pl):   Wtyczka szyfruj±ca dla ekg2
-Group:         Applications/Communications
-Requires:      %{name} = %{version}-%{release}
-
-%description plugin-sim
-Message encryption plugin for ekg2.
-
-%description plugin-sim -l pl
-Wtyczka szyfruj±ca wiadomo¶ci dla ekg2.
-
 
 %package plugin-ioctld
 Summary:       Ioctld plugin for ekg2
@@ -145,13 +120,11 @@ Group:            Applications/Communications
 Requires:      %{name} = %{version}-%{release}
 
 %description plugin-ioctld
-Ioctld plugin for ekg2 (contains suid binary!)
+Ioctld plugin for ekg2 (contains suid root binary!).
 
 %description plugin-ioctld -l pl
-Plugin ioctld dla ekg2 (zawiera program z ustawionym suid!)
+Plugin ioctld dla ekg2 (zawiera program z ustawionym suid root!).
 
-
-%if %{with sqlite}
 %package plugin-logsqlite
 Summary:       SQLite log plugin for ekg2
 Summary(pl):   Wtyczka logowania do SQLite dla ekg2
@@ -163,10 +136,19 @@ SQLite log plugin for ekg2.
 
 %description plugin-logsqlite -l pl
 Wtyczka logowania do bazy SQLite dla ekg2.
-%endif
 
+%package plugin-sim
+Summary:       Encryption plugin for ekg2
+Summary(pl):   Wtyczka szyfruj±ca dla ekg2
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description plugin-sim
+Message encryption plugin for ekg2.
+
+%description plugin-sim -l pl
+Wtyczka szyfruj±ca wiadomo¶ci dla ekg2.
 
-%if %{with xosd}
 %package plugin-xosd
 Summary:       xosd plugin for ekg2
 Summary(pl):   Wtyczka xosd dla ekg2
@@ -178,8 +160,6 @@ xosd plugin for ekg2.
 
 %description plugin-xosd -l pl
 Wtyczka xosd dla ekg2.
-%endif
-
 
 %prep
 %setup -q -n %{name}-%{_snap}
@@ -198,14 +178,14 @@ cd ..
 %{__autoheader}
 %{__automake}
 %configure \
-       --with%{!?with_gadugadu:out}-libgadu \
-       --with%{!?with_jabber:out}-expat \
        --with%{!?with_aspell:out}-aspell \
-       --with%{!?with_sqlite:out}-sqlite \
-       --with%{!?with_python:out}-python \
+       --with%{!?with_jabber:out}-expat \
+       --with%{!?with_gadugadu:out}-libgadu \
        --with%{!?with_libgsm:out}-libgsm \
+       --with%{!?with_python:out}-python \
+       --with%{!?with_sqlite:out}-sqlite \
        --with%{!?with_xosd:out}-xosd
-       
+
 %{__make}
 
 %install
@@ -230,39 +210,37 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/plugins
 %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/sms.so
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/*.txt
 %{_datadir}/%{name}/plugins/rc
 %{_datadir}/%{name}/plugins/sms
 %{_datadir}/%{name}/plugins/logs
 %{_datadir}/%{name}/plugins/ncurses
 
-%if %{with gadugadu}
 %files plugin-protocol-gg
 %attr(755,root,root) %{_libdir}/%{name}/plugins/gg.so
 %{_datadir}/%{name}/plugins/gg
-%endif
 
-%if %{with jabber}
-%files plugin-protocol-jabber
-%attr(755,root,root) %{_libdir}/%{name}/plugins/jabber.so
-%{_datadir}/%{name}/plugins/jabber
+%if %{with libgsm}
+%files plugin-protocol-gsm
+%attr(755,root,root) %{_libdir}/%{name}/plugins/gsm.so
 %endif
 
 %files plugin-protocol-irc
 %attr(755,root,root) %{_libdir}/%{name}/plugins/irc.so
 %{_datadir}/%{name}/plugins/irc
 
-%if %{with libgsm}
-%files plugin-protocol-gsm
-%attr(755,root,root) %{_libdir}/%{name}/plugins/gsm.so
+%if %{with jabber}
+%files plugin-protocol-jabber
+%attr(755,root,root) %{_libdir}/%{name}/plugins/jabber.so
+%{_datadir}/%{name}/plugins/jabber
 %endif
 
 %if %{with python}
@@ -271,10 +249,6 @@ rm -rf $RPM_BUILD_ROOT
 # %{_datadir}/%{name}/plugins/jabber
 %endif
 
-%files plugin-sim
-%attr(755,root,root) %{_libdir}/%{name}/plugins/sim.so
-%{_datadir}/%{name}/plugins/sim
-
 %files plugin-ioctld
 %attr(755,root,root) %{_libdir}/%{name}/plugins/ioctld.so
 %{_datadir}/%{name}/plugins/ioctld
@@ -286,6 +260,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/logsqlite
 %endif
 
+%files plugin-sim
+%attr(755,root,root) %{_libdir}/%{name}/plugins/sim.so
+%{_datadir}/%{name}/plugins/sim
+
 %if %{with xosd}
 %files plugin-xosd
 %defattr(644,root,root,755)