Author: qboosh Date: Tue Nov 16 07:58:57 2010 GMT Module: packages Tag: HEAD ---- Log message: - added link patch to fix ncurses linking - release 2
---- Files affected: packages/cpmtools: cpmtools.spec (1.13 -> 1.14) , cpmtools-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/cpmtools/cpmtools.spec diff -u packages/cpmtools/cpmtools.spec:1.13 packages/cpmtools/cpmtools.spec:1.14 --- packages/cpmtools/cpmtools.spec:1.13 Sun Nov 14 22:18:23 2010 +++ packages/cpmtools/cpmtools.spec Tue Nov 16 08:58:52 2010 @@ -3,13 +3,15 @@ Summary(pl.UTF-8): Narzędzia pozwalające na dostęp do systemów plików CP/M Name: cpmtools Version: 2.13 -Release: 1 +Release: 2 License: GPL v3+ Group: Applications Source0: http://www.moria.de/~michael/cpmtools/%{name}-%{version}.tar.gz # Source0-md5: d0622e33c80d2abb44cbe2e844285ce6 Patch0: %{name}-DESTDIR.patch +Patch1: %{name}-link.patch URL: http://www.moria.de/~michael/cpmtools/ +BuildRequires: autoconf >= 2.13 BuildRequires: libdsk-devel BuildRequires: ncurses-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,8 +31,10 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +%{__autoconf} CFLAGS="%{rpmcflags} -I/usr/include/ncurses" %configure \ --datarootdir=%{_datadir}/misc \ @@ -67,6 +71,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2010/11/16 07:58:52 qboosh +- added link patch to fix ncurses linking +- release 2 + Revision 1.13 2010/11/14 21:18:23 qboosh - updated to 2.13 - updated DESTDIR patch ================================================================ Index: packages/cpmtools/cpmtools-link.patch diff -u /dev/null packages/cpmtools/cpmtools-link.patch:1.1 --- /dev/null Tue Nov 16 08:58:57 2010 +++ packages/cpmtools/cpmtools-link.patch Tue Nov 16 08:58:52 2010 @@ -0,0 +1,36 @@ +--- cpmtools-2.13/configure.in.orig 2010-03-30 20:06:02.000000000 +0200 ++++ cpmtools-2.13/configure.in 2010-11-16 08:36:21.015098261 +0100 +@@ -62,10 +62,12 @@ + + dnl Check for curses. If not found, don't build fsed.cpm + dnl Try both curses and ncurses +-AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm LIBS="-lcurses $LIBS", FSED_CPM=) ++AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lcurses", FSED_CPM=) + if test x"$FSED_CPM" = x""; then +- AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm LIBS="-lncurses $LIBS", FSED_CPM=) ++ AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lncurses", FSED_CPM=) + fi ++AC_CHECK_LIB(tinfo, raw, NCURSESLIBS="$NCURSESLIBS -ltinfo") ++AC_SUBST([NCURSESLIBS]) + + dnl If using libdsk, check it's available. + if test "$LIBDSK" != ""; then +--- cpmtools-2.13/Makefile.in.orig 2010-11-16 08:31:59.727101613 +0100 ++++ cpmtools-2.13/Makefile.in 2010-11-16 08:32:59.059104128 +0100 +@@ -20,6 +20,7 @@ + EXEEXT = @EXEEXT@ + OBJEXT = ....@objext@ + LIBS= @LIBS@ @LDLIBS@ ++NCURSESLIBS= @NCURSESLIBS@ + LDDEPS= @LDDEPS@ + CPPFLAGS= @CPPFLAGS@ -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\" + # +@@ -63,7 +64,7 @@ + $(CC) $(LDFLAGS) -o $@ fsck.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS) + + fsed.cpm$(EXEEXT): fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS) +- $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(NCURSESLIBS) $(LIBS) + + fsck.test: fsck.cpm + -./fsck.cpm -f ibm-3740 -n badfs/status ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cpmtools/cpmtools.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
