SPECS: ekg2.spec - merged from DEVEL

pawelz pawelz at pld-linux.org
Sun Mar 8 20:46:48 CET 2009 

Author: pawelz                       Date: Sun Mar  8 19:46:47 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   ekg2.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: SPECS/ekg2.spec
diff -u SPECS/ekg2.spec:1.97 SPECS/ekg2.spec:1.98
--- SPECS/ekg2.spec:1.97	Mon Feb 23 23:12:18 2009
+++ SPECS/ekg2.spec	Sun Mar  8 20:46:41 2009
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 #
 # 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
@@ -18,15 +16,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
@@ -39,16 +29,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
@@ -61,7 +51,7 @@
 %{?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}
@@ -129,7 +119,7 @@
 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.
@@ -202,6 +192,18 @@
 %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
@@ -301,8 +303,9 @@
 %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
 
@@ -388,18 +391,9 @@
 %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
@@ -419,11 +413,9 @@
 %{_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
@@ -443,6 +435,10 @@
 %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
@@ -455,11 +451,9 @@
 %{_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
@@ -509,11 +503,25 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.97  2009/02/23 22:12:18  arekm
-- release 7
+Revision 1.98  2009/03/08 19:46:41  pawelz
+- merged from DEVEL
+
+Revision 1.95.2.5  2009/02/24 23:16:55  pawelz
+- added patch2 (buildfix for gtk+2 >= 2:2.14.1)
+- BR: gtk+2 >= 2:2.14.1
+- plugin-gtk R: gtk+2 >= 2:2.14.1
+
+Revision 1.95.2.4  2009/02/03 19:56:27  qboosh
+- typo
+
+Revision 1.95.2.3  2009/02/01 13:52:35  paszczus
+- added ICQ plugin
+
+Revision 1.95.2.2  2009/01/22 05:13:54  paszczus
+- fixed typo in Release
 
-Revision 1.96  2009/02/18 20:52:29  arekm
-- release 6
+Revision 1.95.2.1  2009/01/21 13:08:41  pawelz
+- up to the svn trunk
 
 Revision 1.95  2008/11/19 12:33:30  baggins
 - rel 5
================================================================

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

More information about the pld-cvs-commit mailing list