OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Jun-2006 09:17:02
Branch: HEAD Handle: 2006061808170100
Modified files:
openpkg-src/ncurses ncurses.patch ncurses.spec
Log:
vendor recreated the patch set, so update our packages from scratch
Summary:
Revision Changes Path
1.7 +12 -12 openpkg-src/ncurses/ncurses.patch
1.264 +28 -52 openpkg-src/ncurses/ncurses.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ncurses/ncurses.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 ncurses.patch
--- openpkg-src/ncurses/ncurses.patch 23 Jan 2005 08:38:45 -0000 1.6
+++ openpkg-src/ncurses/ncurses.patch 18 Jun 2006 07:17:01 -0000 1.7
@@ -68,15 +68,15 @@
infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
-Index: test/Makefile.in
---- test/Makefile.in.orig Sun Dec 7 02:36:16 2003
-+++ test/Makefile.in Wed Dec 22 13:04:47 2004
-@@ -147,7 +147,7 @@
- @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/color_set$o $(LDFLAGS_DEFAULT)
-
- demo_defkey$x: $(MODEL)/demo_defkey$o $(LOCAL_LIBS)
-- @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_defkey$o $(LDFLAGS_CURSES)
-+ @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_defkey$o $(MODEL)/key_defined$o
$(LDFLAGS_CURSES)
-
- demo_forms$x: $(MODEL)/demo_forms$o $(MODEL)/edit_field$o $(LOCAL_LIBS)
- @ECHO_LINK@ $(LINK) -o $@ $(MODEL)/demo_forms$o $(MODEL)/edit_field$o
$(LDFLAGS_DEFAULT)
+Index: test/programs
+--- test/programs.orig 2006-06-18 09:10:51 +0200
++++ test/programs 2006-06-18 09:13:14 +0200
+@@ -36,7 +36,7 @@
+ cardfile $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) cardfile
+ color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set
+ demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys
+-demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey
++demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey key_defined
+ demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field
+ demo_keyok $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_keyok
+ demo_menus $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_menus
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ncurses/ncurses.spec
============================================================================
$ cvs diff -u -r1.263 -r1.264 ncurses.spec
--- openpkg-src/ncurses/ncurses.spec 28 May 2006 07:56:22 -0000 1.263
+++ openpkg-src/ncurses/ncurses.spec 18 Jun 2006 07:17:01 -0000 1.264
@@ -24,41 +24,28 @@
# package versions
%define V_base 5.5
-%define V_patch1 20051015
-%define V_patch2 20051022
-%define V_patch3 20051029
-%define V_patch4 20051112
-%define V_patch5 20051119
-%define V_patch6 20051126
-%define V_patch7 20051203
-%define V_patch8 20051210
-%define V_patch9 20051217
-%define V_patch10 20051224
-%define V_patch11 20051231
-%define V_patch12 20060107
-%define V_patch13 20060111
-%define V_patch14 20060114
-%define V_patch15 20060121
-%define V_patch16 20060128
-%define V_patch17 20060204
-%define V_patch18 20060211
-%define V_patch19 20060218
-%define V_patch20 20060225
-%define V_patch21 20060311
-%define V_patch22 20060312
-%define V_patch23 20060318
-%define V_patch24 20060401
-%define V_patch25 20060408
-%define V_patch26 20060415
-%define V_patch27 20060416
-%define V_patch28 20060422
-%define V_patch29 20060506
-%define V_patch30 20060513
-%define V_patch31 20060520
-%define V_patch32 20060527
+%define V_patch1 20060128
+%define V_patch2 20060204
+%define V_patch3 20060211
+%define V_patch4 20060218
+%define V_patch5 20060225
+%define V_patch6 20060311
+%define V_patch7 20060312
+%define V_patch8 20060318
+%define V_patch9 20060401
+%define V_patch10 20060408
+%define V_patch11 20060415
+%define V_patch12 20060416
+%define V_patch13 20060422
+%define V_patch14 20060506
+%define V_patch15 20060513
+%define V_patch16 20060520
+%define V_patch17 20060527
+%define V_patch18 20060603
+%define V_patch19 20060617
%define V_patchB %{V_patch1}
-%define V_patchL %{V_patch32}
-%define V_patches 32
+%define V_patchL %{V_patch19}
+%define V_patches 19
# package information
Name: ncurses
@@ -71,11 +58,11 @@
Group: Terminal
License: GPL
Version: %{V_base}.%{V_patchL}
-Release: 20060528
+Release: 20060618
# list of sources
Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz
-Patch1:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch1}.patch.gz
+Patch1:
ftp://invisible-island.net/ncurses/%{V_base}/patch-%{V_base}-%{V_patch1}.sh.gz
Patch2:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch2}.patch.gz
Patch3:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch3}.patch.gz
Patch4:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch4}.patch.gz
@@ -94,19 +81,6 @@
Patch17:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch17}.patch.gz
Patch18:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch18}.patch.gz
Patch19:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch19}.patch.gz
-Patch20:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch20}.patch.gz
-Patch21:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch21}.patch.gz
-Patch22:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch22}.patch.gz
-Patch23:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch23}.patch.gz
-Patch24:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch24}.patch.gz
-Patch25:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch25}.patch.gz
-Patch26:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch26}.patch.gz
-Patch27:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch27}.patch.gz
-Patch28:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch28}.patch.gz
-Patch29:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch29}.patch.gz
-Patch30:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch30}.patch.gz
-Patch31:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch31}.patch.gz
-Patch32:
ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch32}.patch.gz
Patch100: ncurses.patch
# build information
@@ -157,9 +131,11 @@
%{expand:%(i=1; while [ $i -le %{V_patches} ]; do %{l_shtool} echo
-n " %%{PATCH$i}"; i=`expr $i + 1`; done)}
do
case "$patchfile" in
- *bz2 ) %{l_bzip2} -d -c $patchfile | %{l_patch} -p1 || true ;;
- *gz ) %{l_gzip} -d -c $patchfile | %{l_patch} -p1 || true ;;
- * )
+ *.sh.bz2 ) %{l_bzip2} -d -c $patchfile | sh - || true ;;
+ *.sh.gz ) %{l_gzip} -d -c $patchfile | sh - || true ;;
+ *.patch.bz2 ) %{l_bzip2} -d -c $patchfile | %{l_patch} -p1 ||
true ;;
+ *.patch.gz ) %{l_gzip} -d -c $patchfile | %{l_patch} -p1 ||
true ;;
+ * )
echo "Unknown patch format" | %{l_rpmtool} msg -b -t error
1>&2
exit 1
;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
