packages: ruby-Ncurses/ruby-Ncurses-utf8.patch, ruby-Ncurses/ruby-Ncurses.s...

[wiget]

Author: wiget                        Date: Sun Nov 29 23:07:45 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.4

---- Files affected:
packages/ruby-Ncurses:
   ruby-Ncurses-utf8.patch (1.2 -> 1.3) , ruby-Ncurses.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/ruby-Ncurses/ruby-Ncurses-utf8.patch
diff -u packages/ruby-Ncurses/ruby-Ncurses-utf8.patch:1.2 packages/ruby-Ncurses/ruby-Ncurses-utf8.patch:1.3
--- packages/ruby-Ncurses/ruby-Ncurses-utf8.patch:1.2	Thu Jan 15 18:15:54 2009
+++ packages/ruby-Ncurses/ruby-Ncurses-utf8.patch	Mon Nov 30 00:07:39 2009
@@ -1,7 +1,16 @@
---- ncurses-ruby-0.9.1.orig/extconf.rb	2009-01-15 18:02:52.755914008 +0100
-+++ ncurses-ruby-0.9.1/extconf.rb	2009-01-15 18:06:43.026276379 +0100
-@@ -27,6 +27,8 @@
+--- ncurses-ruby-1.2.4/extconf.rb.orig	2009-07-31 12:52:36.000000000 +0200
++++ ncurses-ruby-1.2.4/extconf.rb	2009-11-29 23:54:01.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ require "mkmf"
+ 
+-$CFLAGS  += " -g"
++$CFLAGS  += " -g -I/usr/include/ncursesw"
+ $CXXFLAGS  = $CFLAGS
+ 
  have_header("unistd.h")
+@@ -30,6 +30,8 @@ have_header("locale.h")
+ 
  if have_header("ncurses.h")
    curses_header = "ncurses.h"
 +elsif have_header("ncursesw/curses.h")
@@ -9,7 +18,7 @@
  elsif have_header("ncurses/curses.h")
    curses_header = "ncurses/curses.h"
  elsif have_header("curses.h")
-@@ -35,7 +37,9 @@
+@@ -38,7 +40,9 @@ else
    raise "ncurses header file not found"
  end
  
@@ -20,7 +29,7 @@
    curses_lib = "ncurses"
  elsif have_library("pdcurses", "wmove")
    curses_lib = "pdcurses"
-@@ -120,11 +124,11 @@
+@@ -123,15 +127,15 @@ have_func("attr_get")
  
  puts "checking for the panel library..."
  if have_header("panel.h")
@@ -32,5 +41,10 @@
 -  have_library("form", "new_form")
 +  have_library("formw", "new_form")
  end
+ puts "checking for the menu library..."
+ if have_header("menu.h")
+-  have_library("menu", "new_menu")
++  have_library("menuw", "new_menu")
+ end
  
- create_makefile('ncurses')
+ create_makefile('ncurses_bin')

================================================================
Index: packages/ruby-Ncurses/ruby-Ncurses.spec
diff -u packages/ruby-Ncurses/ruby-Ncurses.spec:1.17 packages/ruby-Ncurses/ruby-Ncurses.spec:1.18
--- packages/ruby-Ncurses/ruby-Ncurses.spec:1.17	Wed Feb 18 21:53:06 2009
+++ packages/ruby-Ncurses/ruby-Ncurses.spec	Mon Nov 30 00:07:39 2009
@@ -3,12 +3,12 @@
 Summary:	Ruby interface to Ncurses
 Summary(pl.UTF-8):	Interfejs Ncurses dla Ruby
 Name:		ruby-Ncurses
-Version:	0.9.1
-Release:	7
+Version:	1.2.4
+Release:	1
 License:	Ruby-alike
 Group:		Development/Languages
 Source0:	http://download.berlios.de/%{tarname}/%{tarname}-%{version}.tar.bz2
-# Source0-md5:	cb99721b492995bb3548b700b6e86fe2
+# Source0-md5:	8a3e0ed33ac245241b6afd911520c205
 Patch0:		%{name}-utf8.patch
 URL:		http://ncurses-ruby.berlios.de/
 BuildRequires:	rpmbuild(macros) >= 1.277
@@ -39,14 +39,13 @@
 %prep
 %setup -q -n %{tarname}-%{version}
 %patch0 -p1
-%{__sed} -i "s at curses.h@ncursesw/curses.h@" ncurses_wrap.h
 
 %build
 ruby extconf.rb
 
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fPIC"
+	CFLAGS="%{rpmcflags} -I/usr/include/ncursesw -fPIC"
 
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
@@ -55,9 +54,12 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_archdir}}
 
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+#cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
-install ncurses.so $RPM_BUILD_ROOT%{ruby_archdir}
+#install ncurses.so $RPM_BUILD_ROOT%{ruby_archdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,8 +67,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README rdoc
-%{ruby_rubylibdir}/*.rb
-%attr(755,root,root) %{ruby_archdir}/*.so
+%{ruby_sitelibdir}/*.rb
+%attr(755,root,root) %{ruby_sitearchdir}/*.so
 %{ruby_ridir}/Ncurses
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -75,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2009/11/29 23:07:39  wiget
+- updated to 1.2.4
+
 Revision 1.17  2009/02/18 20:53:06  arekm
 - release 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-Ncurses/ruby-Ncurses-utf8.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-Ncurses/ruby-Ncurses.spec?r1=1.17&r2=1.18&f=u