- merged from DEVEL

Changed files:
    ekg2.spec -> 1.98

diff --git a/ekg2.spec b/ekg2.spec
index 31e64f185b513b24fe3e2e393857eadfe57f8346..dbcaf94f59dce4d6d0d84ffca283399b8278503e 100644 (file)
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -1,7 +1,5 @@
 #
 # 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
@@ -17,15 +15,7 @@
 %bcond_without sqlite3                 # don't build logsqlite plugin based on sqlite3
 %bcond_without xosd                    # don't build xosd plugin
 
-%if %{without yesterday_snapshot}
-%define                _snap 0.1.1
-%define                _ver 0.1.1
-%define                _tarballformat gz
-%else
-%define                _snap %(date +%%Y%%m%%d -d yesterday)
-%define                _ver 0.0.%{_snap}
-%define                _tarballformat bz2
-%endif
+%define                _snap 20090120
 
 %if %{without jabber}
 %undefine with_gnutls
@@ -38,16 +28,16 @@
 Summary:       Multi-protocol instant messaging and chat client
 Summary(pl.UTF-8):     Wieloprotokołowy komunikator internetowy
 Name:          ekg2
-Version:       %{_ver}
-Release:       7
+Version:       0.1.3
+Release:       0.%{_snap}.1
 Epoch:         2
 License:       GPL v2+
 Group:         Applications/Communications
-Source0:       http://pl.ekg2.org/%{name}-%{_snap}.tar.%{_tarballformat}
-# Source0-md5: 8c64ab909687b9ac3798caa7736d7b2a
+Source0:       %{name}-%{_snap}.tar.bz2
+# Source0-md5: 4e7fdba759f3fd43145d3afbc91e8fe1
 Patch0:                %{name}-perl-install.patch
-#Patch1:       %{name}-no_scripts.patch
-Patch2:                %{name}-missing-xwcslen.patch
+Patch1:                %{name}-missing-xwcslen.patch
+Patch2:                %{name}-gtk.patch
 URL:           http://ekg2.org/
 %{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: autoconf
@@ -60,7 +50,7 @@ BuildRequires:        gettext-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}
@@ -128,7 +118,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.
@@ -201,6 +191,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
@@ -300,8 +302,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
 
@@ -387,18 +390,9 @@ 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
@@ -418,11 +412,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
@@ -442,6 +434,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
@@ -454,11 +450,9 @@ 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
 
 %if %{with readline}
 %files plugin-readline