[packages/weechat] fix build with current automake

glen glen at pld-linux.org
Sat Apr 20 10:21:22 CEST 2013


commit 18c4530ea0464608cfedf71b3cf20374f3e86bef
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 20 11:21:11 2013 +0300

    fix build with current automake

 weechat.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/weechat.spec b/weechat.spec
index 59aac8f..79260a5 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -1,4 +1,3 @@
-#
 # TODO:
 # - consider doing subpackages for all those plugins (which one should be in main package ?)
 #
@@ -11,8 +10,6 @@
 %bcond_without	python	# don't build python plugin support
 %bcond_without	gnutls	# don't build gnutls support
 
-%define		skip_post_check_so	ruby.so.0.0.0
-
 Summary:	WeeChat - fast and light chat environment
 Summary(pl.UTF-8):	WeeChat - szybkie i lekkie środowisko do rozmów
 Name:		weechat
@@ -35,12 +32,13 @@ BuildRequires:	gettext-devel
 %{?with_gtk:BuildRequires:	gtk+2-devel}
 BuildRequires:	guile-devel
 BuildRequires:	libatomic_ops
-BuildRequires:	libtool
 BuildRequires:	libgcrypt-devel
+BuildRequires:	libtool
 %{?with_lua:BuildRequires:	lua51-devel}
 BuildRequires:	ncurses-devel
 %{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 %if %{with python}
 BuildRequires:	python-devel
 BuildRequires:	python-modules
@@ -51,6 +49,8 @@ BuildRequires:	tcl-devel
 Requires:	%{name}-common = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		skip_post_check_so	ruby.so.0.0.0
+
 %description
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat
 environment for many operating systems. Everything can be done with a
@@ -75,20 +75,21 @@ Summary:	WeeChat common files
 Group:		Applications/Communications
 
 %description common
-WeeChat common files.
+WeeChat common files for Curses and GTK UI.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-sed -i -e 's#PYTHON_LIB=.*#PYTHON_LIB=%{_libdir}#g' configure.in
 
-%if !%{with gtk}
+%{__sed} -i -e 's#PYTHON_LIB=.*#PYTHON_LIB=%{_libdir}#g' configure.in
+%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+
+%if %{without gtk}
 echo 'AC_DEFUN([AM_PATH_GTK_2_0],[])' >> acinclude.m4
 %endif
 
-
 %build
 %{__libtoolize}
 %{__aclocal}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/weechat.git/commitdiff/18c4530ea0464608cfedf71b3cf20374f3e86bef



More information about the pld-cvs-commit mailing list