[ekg2/f14/master] Fix build

Karol Trzcionka karlik at fedoraproject.org
Wed Aug 11 20:16:41 UTC 2010


commit cca30085b8e904da948221839bf55f21201a3ad8
Author: Karol Trzcionka <karlik at fedoraproject.org>
Date:   Wed Aug 11 22:16:38 2010 +0200

    Fix build

 .gitignore |    1 +
 ekg2.spec  |   15 ++++++++++++---
 sources    |    1 +
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3d24ab..df9add3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ekg2-0.2-rc1.tar.gz
+ekg2-gtk2-2.22.patch
diff --git a/ekg2.spec b/ekg2.spec
index d11229b..8edadbb 100644
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -5,18 +5,20 @@ Summary:	Multi-protocol instant messaging and chat client
 Summary(pl):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
 Version:	0.2
-Release:	0.12.rc1%{?dist}
+Release:	0.14.rc1%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
 Patch1:		%{name}-rpm.patch
 Patch2:		%{name}-gcc43.patch
 Patch3:		%{name}-gtk2-2.13.patch
+Patch4:		%{name}-gtk2-2.22.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
 BuildRequires:	automake17
 BuildRequires:	docbook-style-xsl
 BuildRequires:	expat-devel
+BuildRequires:	gettext-autopoint
 BuildRequires:	gettext-devel
 BuildRequires:	giflib-devel
 BuildRequires:	gnutls-devel
@@ -35,8 +37,8 @@ BuildRequires:	python-devel
 BuildRequires:	ruby ruby-devel
 BuildRequires:	sqlite-devel
 BuildRequires:	xosd-devel
-BuildRequires:  cvs
-BuildConflicts: readline-devel
+BuildRequires:	cvs
+BuildConflicts:	readline-devel
 Requires:	%{name}-core = %{version}-%{release}
 Requires:	%{name}-gadu-gadu = %{version}-%{release}
 Requires:	%{name}-gpg = %{version}-%{release}
@@ -212,6 +214,7 @@ Wtyczka XOSD dla ekg2.
 %patch1 -p1 -b .r
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .gtk
+%patch4 -p1 -b .gtkdep
 cp -p README README-main
 # convert docs to UTF-8
 for file in \
@@ -375,6 +378,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/xosd
 
 %changelog
+* Thu Aug 05 2010 Karol Trzcionka <karlikt at gmail.com> - 0.2-0.14.rc1
+- Fix build with new gtk2
+
+* Sat Jul 31 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.2-0.13.rc1
+- Rebuild for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Thu Apr 29 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.2-0.12.rc1
 - Mass rebuild with perl-5.12.0
 
diff --git a/sources b/sources
index 50bd60c..209dc41 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 7ef64a54c8bbca927f8eccc9b10c9edd  ekg2-0.2-rc1.tar.gz
+64503ebff041eb581cf18a4fa9542053  ekg2-gtk2-2.22.patch


More information about the scm-commits mailing list