SHA256
1
0
forked from pool/cdk

Accepting request 33069 from security

Copy from security/cdk based on submit request 33069 from user coolo

OBS-URL: https://build.opensuse.org/request/show/33069
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdk?expand=0&rev=7
This commit is contained in:
OBS User autobuild 2010-02-23 00:13:43 +00:00 committed by Git OBS Bridge
parent afc8f018e7
commit a44472a8b0
3 changed files with 64 additions and 35 deletions

View File

@ -1,5 +1,7 @@
--- Makefile.am
+++ Makefile.am Tue Nov 23 16:29:19 2004
Index: Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ Makefile.am 2010-02-19 12:51:43.000000000 +0100
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 1990 The Regents of the University of California.
@ -56,9 +58,11 @@
+ slider.h swindow.h template.h viewer.h
+doc_DOCS = BUGS EXPANDING NOTES TODO COPYING INSTALL README
+
--- configure.in
+++ configure.in Tue Nov 23 16:30:17 2004
@@ -2,6 +2,7 @@
Index: configure.in
===================================================================
--- configure.in.orig 2004-08-18 05:55:36.000000000 +0200
+++ configure.in 2010-02-19 12:51:43.000000000 +0100
@@ -2,6 +2,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
dnl
AC_INIT(include/cdk.h)
@ -66,7 +70,7 @@
dnl
dnl This looks for a library in several 'standard' locations.
@@ -9,7 +10,7 @@
@@ -9,7 +10,7 @@ dnl
AC_DEFUN(CDK_FIND_LIB, [
eval "cdk_$2_lib=no"
@ -75,7 +79,7 @@
if test -f ${dir}/$1; then
LDFLAGS="$LDFLAGS -L$dir"
eval "cdk_$2_lib=no"
@@ -50,6 +51,10 @@
@@ -50,6 +51,10 @@ dnl
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_INSTALL
@ -86,14 +90,16 @@
dnl
dnl Put -Wall on compile line if we are using gcc or g++
@@ -114,4 +119,4 @@
@@ -114,4 +119,4 @@ else
CFLAGS="$CFLAGS -DHAVE_LIBNCURSES=0"
fi
-AC_OUTPUT(Makefile examples/Makefile demos/Makefile)
+AC_OUTPUT(Makefile man/Makefile include/Makefile examples/Makefile demos/Makefile)
--- ltconfig
+++ ltconfig Tue Nov 23 16:29:19 2004
Index: ltconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ ltconfig 2010-02-19 12:51:43.000000000 +0100
@@ -0,0 +1,3017 @@
+#! /bin/sh
+
@ -3112,8 +3118,10 @@
+# mode:shell-script
+# sh-indentation:2
+# End:
--- demos/Makefile.in
+++ demos/Makefile.in Tue Nov 23 16:29:19 2004
Index: demos/Makefile.in
===================================================================
--- demos/Makefile.in.orig 1998-12-10 05:05:45.000000000 +0100
+++ demos/Makefile.in 2010-02-19 12:51:43.000000000 +0100
@@ -4,7 +4,7 @@
CC = @CC@
LIBS = -lcdk @LIBS@
@ -3123,8 +3131,10 @@
LIBDIR = -L.. @LDFLAGS@
BINS = fileview rolodex command clock stopSign \
appointment serial vinstall
--- examples/Makefile.in
+++ examples/Makefile.in Tue Nov 23 16:29:19 2004
Index: examples/Makefile.in
===================================================================
--- examples/Makefile.in.orig 1998-12-13 07:24:36.000000000 +0100
+++ examples/Makefile.in 2010-02-19 12:51:43.000000000 +0100
@@ -4,7 +4,7 @@
CC = @CC@
LIBS = -lcdk @LIBS@
@ -3134,8 +3144,10 @@
LIBDIR = -L.. @LDFLAGS@
BINS = alphalist_ex bind_ex buttonbox_ex calendar_ex cdkscreen_ex dialog_ex \
entry_ex fselect_ex graph_ex hello_ex histogram_ex \
--- include/Makefile.am
+++ include/Makefile.am Tue Nov 23 16:29:19 2004
Index: include/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ include/Makefile.am 2010-02-19 12:51:43.000000000 +0100
@@ -0,0 +1,8 @@
+include_HEADERS = cdk.h alphalist.h binding.h buttonbox.h \
+ calendar.h cdk_util.h cdkscreen.h \
@ -3145,8 +3157,10 @@
+ menu.h radio.h scale.h scroll.h selection.h \
+ slider.h swindow.h template.h viewer.h
+
--- man/Makefile.am
+++ man/Makefile.am Tue Nov 23 16:29:19 2004
Index: man/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ man/Makefile.am 2010-02-19 12:51:43.000000000 +0100
@@ -0,0 +1,8 @@
+man_MANS = cdk_alphalist.3 cdk_binding.3 cdk_buttonbox.3 cdk_calendar.3 \
+ cdk_cdk.3 cdk_dialog.3 cdk_display.3 cdk_entry.3 \
@ -3156,3 +3170,25 @@
+ cdk_scroll.3 cdk_selection.3 cdk_slider.3 cdk_swindow.3 \
+ cdk_template.3 cdk_viewer.3
+
Index: draw.c
===================================================================
--- draw.c.orig 2001-03-31 05:38:27.000000000 +0200
+++ draw.c 2010-02-19 12:53:35.000000000 +0100
@@ -532,7 +532,7 @@ int getListIndex (CDKSCREEN *screen, cha
}
/* Let the user play. */
- selected = activateCDKScroll (scroll, (chtype)NULL);
+ selected = activateCDKScroll (scroll, (chtype*)NULL);
/* Check how they exited. */
if (scroll->exitType != vNORMAL)
@@ -675,7 +675,7 @@ char *selectFile (CDKSCREEN *screen, cha
TRUE, FALSE);
/* Let the user play. */
- holder = activateCDKFselect (fselect, (chtype)NULL);
+ holder = activateCDKFselect (fselect, (chtype*)NULL);
/* Check the way the user exited the selector. */
if (fselect->exitType != vNORMAL)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 19 11:55:27 UTC 2010 - coolo@novell.com
- fix compilation with gcc 4.5
-------------------------------------------------------------------
Sun Aug 30 20:02:21 CEST 2009 - coolo@novell.com

View File

@ -1,7 +1,7 @@
#
# spec file for package cdk (Version 4.9.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,12 +19,12 @@
Name: cdk
License: BSD 3-clause (or similar)
License: BSD3c(or similar)
BuildRequires: ncurses-devel
Group: System/Libraries
AutoReqProv: on
Version: 4.9.13
Release: 139
Release: 140
Summary: The Runtime for the Curses Development Kit
Source: cdk-4.9.13.tar.bz2
Patch: cdk-4.9.13.dif
@ -36,14 +36,8 @@ contains 21 ready to use widgets, some of which are: a text entry
field, a scrolling list, a selection list, an alphalist, a pull-down
menu, a radio list, a viewer widget, and a dialog box.
Authors:
--------
Mike Glover <glover@credit.erin.utoronto.ca>
%package -n cdk-devel
License: BSD 3-clause (or similar)
License: BSD3c(or similar)
Summary: Development Part of Curses Development Kit
Group: Development/Libraries/C and C++
Requires: %{name} = %{version} ncurses-devel
@ -53,12 +47,6 @@ AutoReqProv: on
This package includes the development headers and static libraries for
CDK, the Curses Development Kit.
Authors:
--------
Mike Glover <glover@credit.erin.utoronto.ca>
%prep
%setup -q
%patch -p0
@ -78,7 +66,7 @@ autoreconf --force --install
--disable-static \
--with-gnu-ld \
--with-pic
%{__make} %{?jobs:-j%jobs}
%{__make} %{?smpflags}
%install
make DESTDIR=${RPM_BUILD_ROOT} install