Explorar el Código

upgrading package: joe 2.9.8 -> 3.0

Ralf S. Engelschall hace 21 años
padre
commit
10b6255755
Se han modificado 2 ficheros con 43 adiciones y 6 borrados
  1. 38 2
      joe/joe.patch
  2. 5 4
      joe/joe.spec

+ 38 - 2
joe/joe.patch

@@ -1,5 +1,19 @@
---- termcap.c.dist	2003-07-02 16:35:41.000000000 +0200
-+++ termcap.c	2003-07-02 16:35:50.000000000 +0200
+Index: regex.c
+--- regex.c.orig	2004-04-17 15:09:09.000000000 +0200
++++ regex.c	2004-05-10 10:16:35.000000000 +0200
+@@ -10,7 +10,8 @@
+ 
+ #include <stdio.h> 
+ #include <ctype.h>
+-#include <wctype.h>
++#include <libutf8.h>
++#include <utf8/wctype.h>
+ 
+ #include "b.h"
+ #include "utf8.h"
+Index: termcap.c
+--- termcap.c.orig	2004-04-10 07:20:20.000000000 +0200
++++ termcap.c	2004-05-10 10:14:36.000000000 +0200
 @@ -20,6 +20,7 @@
  #endif
  #ifdef TERMINFO
@@ -8,3 +22,25 @@
  #include <term.h>
  #endif
  #endif
+Index: utf8.h
+--- utf8.h.orig	2004-04-18 03:26:00.000000000 +0200
++++ utf8.h	2004-05-10 10:17:46.000000000 +0200
+@@ -10,6 +10,7 @@
+ 
+ #include "config.h"
+ #include "types.h"
++#include "libutf8.h"
+ 
+ /* UTF-8 Encoder
+  *
+Index: utils.c
+--- utils.c.orig	2004-04-23 00:35:28.000000000 +0200
++++ utils.c	2004-05-10 10:18:13.000000000 +0200
+@@ -16,6 +16,7 @@
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
++#include "libutf8.h"
+ 
+ #include "blocks.h"
+ #include "utils.h"

+ 5 - 4
joe/joe.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        PLUS
 Group:        Editor
 License:      GPL
-Version:      2.9.8
-Release:      20040207
+Version:      3.0
+Release:      20040510
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/joe-editor/joe-%{version}.tar.gz
@@ -45,8 +45,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  ncurses
-PreReq:       ncurses
+BuildPreReq:  ncurses, libiconv, libutf8
+PreReq:       ncurses, libiconv, libutf8
 AutoReq:      no
 AutoReqProv:  no
 
@@ -77,6 +77,7 @@ AutoReqProv:  no
     CPPFLAGS="%{l_cppflags}" \
     CFLAGS="%{l_cflags -O} %{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
+    LIBS="-liconv -lutf8" \
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/joe