From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 13 Jul 2011 06:26:14 +0000 (+0000)
Subject: - rel 1; builds
X-Git-Tag: auto/th/tmux-1_5-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=27a56cc0964493b54ae93900c64c893a217dd70c;p=packages%2Ftmux.git

- rel 1; builds

Changed files:
    tmux-makefile.patch -> 1.3
    tmux-term.patch -> 1.1
    tmux.spec -> 1.14
---

diff --git a/tmux-makefile.patch b/tmux-makefile.patch
deleted file mode 100644
index 787eece..0000000
--- a/tmux-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tmux-1.3-orig/GNUmakefile	2010-07-19 07:54:24.320563707 +0200
-+++ tmux-1.3/GNUmakefile	2010-07-19 07:58:25.390541271 +0200
-@@ -81,7 +81,7 @@
- install:	all
- 		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
- 		$(INSTALLBIN) tmux $(DESTDIR)$(PREFIX)/bin/tmux
--		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
--		$(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/man/man1/tmux.1
-+		$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1
-+		$(INSTALLMAN) tmux.1 $(DESTDIR)$(PREFIX)/share/man/man1/tmux.1
- 
- -include .depend
diff --git a/tmux-term.patch b/tmux-term.patch
new file mode 100644
index 0000000..625068d
--- /dev/null
+++ b/tmux-term.patch
@@ -0,0 +1,11 @@
+--- tmux-1.5/configure.ac~	2011-07-09 18:00:17.000000000 +0200
++++ tmux-1.5/configure.ac	2011-07-13 08:24:00.018775830 +0200
+@@ -113,7 +113,7 @@
+ # Look for curses.
+ AC_SEARCH_LIBS(
+ 	setupterm,
+-	[terminfo curses ncurses],
++	[tinfow tinfo terminfo curses ncurses],
+ 	found_curses=yes,
+ 	found_curses=no
+ )
diff --git a/tmux.spec b/tmux.spec
index c161c04..43755e8 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -5,13 +5,13 @@ Summary:	tmux is a terminal multiplexer
 Summary(hu.UTF-8):	tmux egy terminál-sokszorozó
 Name:		tmux
 Version:	1.5
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Applications/Terminal
 Source0:	http://downloads.sourceforge.net/tmux/%{name}-%{version}.tar.gz
 # Source0-md5:	3d4b683572af34e83bc8b183a8285263
 Source1:	%{name}-filedetect.vim
-Patch0:		%{name}-makefile.patch
+Patch0:		%{name}-term.patch
 URL:		http://tmux.sourceforge.net/
 BuildRequires:	libevent-devel
 BuildRequires:	ncurses-devel
@@ -51,15 +51,15 @@ This package provides bash-completion for tmux.
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
 %configure \
-	CFLAGS="%{rpmcflags} -I/usr/include/ncursesw"
+	CPPFLAGS="-I/usr/include/ncursesw"
 
-CFLAGS="%{rpmcppflags} %{rpmcflags} -I/usr/include/ncursesw" %{__make} \
-	CC="%{__cc}" \
-	PREFIX=%{_prefix}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT