From 1b57213401f3562184a94433a22dc0bb7f84e7cc Mon Sep 17 00:00:00 2001 From: mef Date: Jul 06 2009 11:15:22 +0000 Subject: Update to latest upstream Fix multilib issues Remove redundant patches --- diff --git a/.cvsignore b/.cvsignore index 3bf0132..db3f12b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -pl-5.7.6.tar.gz -HTMLmanual.tar.gz userguide.html.tgz +pl-5.7.11.tar.gz +SWI-Prolog-5.7.11.pdf diff --git a/pl-5.4.6-rpath.patch b/pl-5.4.6-rpath.patch deleted file mode 100644 index ded4f2b..0000000 --- a/pl-5.4.6-rpath.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur pl-5.4.6-orig/packages/xpce/pl/src/Makefile pl-5.4.6/packages/xpce/pl/src/Makefile ---- pl-5.4.6-orig/packages/xpce/pl/src/Makefile 2004-09-21 16:22:24.000000000 +0200 -+++ pl-5.4.6/packages/xpce/pl/src/Makefile 2005-02-12 03:47:19.000000000 +0100 -@@ -114,12 +114,8 @@ - fi - - sopce$(XPCESO): -- LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ -- export LD_RUN_PATH; \ - $(PLLD) -shared $(SOITF) $(LDFLAGS) -L$(XLIB) -L$(LIBDIR) -lXPCE -o $(XPCESO); - axpce$(XPCESO): -- LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ -- export LD_RUN_PATH; \ - $(PLLD) -shared $(LDFLAGS) $(SOITF) $(SOEXTR) -L$(LIBDIR) \ - -lXPCE $(GCCLIB) -L$(XLIB) $(XLIBS) $(NETLIBS) -o $(XPCESO); - diff --git a/pl-5.6.0-multilib.patch b/pl-5.6.0-multilib.patch deleted file mode 100644 index e80b952..0000000 --- a/pl-5.6.0-multilib.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- pl-5.6.0/src/rc/Makefile.in.multilib 2006-01-02 22:43:19.000000000 +0100 -+++ pl-5.6.0/src/rc/Makefile.in 2006-01-02 22:43:46.000000000 +0100 -@@ -18,7 +18,8 @@ - srcdir=@srcdir@ - @VPATH@ @srcdir@ - bindir=$(exec_prefix)/bin --PLBASE=$(prefix)/lib/@PL@-$(PLVERSION) -+libdir=@libdir@ -+PLBASE=$(libdir)/@PL@-$(PLVERSION) - man_prefix=$(prefix)/man - mansec=1 - lmansec=3 ---- pl-5.6.0/src/configure.multilib 2006-01-02 22:41:36.000000000 +0100 -+++ pl-5.6.0/src/configure 2006-01-02 22:41:59.000000000 +0100 -@@ -2546,7 +2546,7 @@ - - - test "x$prefix" = xNONE && prefix=$ac_default_prefix --PLBASE=$prefix/lib/$PL-$PLVERSION -+PLBASE=$libdir/$PL-$PLVERSION - - - for ac_prog in gmake make ---- pl-5.6.0/src/Makefile.in.multilib 2006-01-02 22:42:12.000000000 +0100 -+++ pl-5.6.0/src/Makefile.in 2006-01-02 22:42:46.000000000 +0100 -@@ -46,7 +46,8 @@ - PLVERSION=@PLVERSION@ - PL=@PL@@RT@ - PLV=@PL@@RT@-@PLVERSION@ --PLBASE=$(prefix)/lib/@PL@@RT@-@PLVERSION@ -+libdir=@libdir@ -+PLBASE=$(libdir)/@PL@@RT@-@PLVERSION@ - BOOTFILE=@BOOTFILE@ - - CC=@CC@ ---- pl-5.6.0/packages/Makefile.in.multilib 2006-01-02 22:39:53.000000000 +0100 -+++ pl-5.6.0/packages/Makefile.in 2006-01-02 22:41:19.000000000 +0100 -@@ -30,7 +30,8 @@ - bindir=@bindir@ - PL=@PL@@RT@ - PLVERSION=@PLVERSION@ --PLBASE=$(prefix)/lib/@PL@-$(PLVERSION) -+libdir=@libdir@ -+PLBASE=$(libdir)/@PL@-$(PLVERSION) - PKGDOC=$(PLBASE)/doc/packages - PLLIBS=@LIBS@ - PLARCH=@ARCH@ diff --git a/pl-5.6.52-jni.patch b/pl-5.6.52-jni.patch deleted file mode 100644 index 3590b2a..0000000 --- a/pl-5.6.52-jni.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur pl-5.6.52/packages/jpl.orig/jpl.pl pl-5.6.52/packages/jpl/jpl.pl ---- pl-5.6.52/packages/jpl.orig/jpl.pl 2008-03-12 20:33:08.000000000 +0100 -+++ pl-5.6.52/packages/jpl/jpl.pl 2008-04-08 14:47:59.000000000 +0200 -@@ -4390,7 +4390,8 @@ - :- multifile user:file_search_path/2. - :- dynamic user:file_search_path/2. - --user:file_search_path(jar, swi(lib)). -+user:file_search_path(jar, 'LIBDIR/pl-jpl'). -+user:file_search_path(jni, 'LIBDIR/pl-jpl'). - - %% add_search_path(+Var, +Value) is det. - % -@@ -4534,7 +4535,7 @@ - - libjpl(File) :- - ( current_prolog_flag(unix, true) -- -> File = foreign(libjpl) -+ -> File = jni(libjpl) - ; File = foreign(jpl) - ). - -diff -ur pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java ---- pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java 2008-03-12 20:33:08.000000000 +0100 -+++ pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java 2008-04-08 14:17:08.000000000 +0200 -@@ -79,7 +79,7 @@ - */ - public final class Prolog { - static { -- System.loadLibrary("jpl"); -+ System.load("LIBDIR/pl-jpl/libjpl.so"); - } - - /* term types */ diff --git a/pl-5.6.55-configure.patch b/pl-5.6.55-configure.patch deleted file mode 100644 index 2265a7d..0000000 --- a/pl-5.6.55-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- pl-5.6.55/src/configure.orig 2008-05-12 20:57:45.000000000 +0100 -+++ pl-5.6.55/src/configure 2008-05-20 15:02:57.000000000 +0100 -@@ -9480,7 +9480,7 @@ - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); -+extern int $ac_func; - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -@@ -9491,7 +9491,7 @@ - int - main () - { --return $ac_func (); -+return $ac_func; - ; - return 0; - } -@@ -9592,7 +9592,7 @@ - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); -+extern int $ac_func; - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -@@ -9603,7 +9603,7 @@ - int - main () - { --return $ac_func (); -+return $ac_func; - ; - return 0; - } diff --git a/pl-5.6.57-locale.patch b/pl-5.6.57-locale.patch deleted file mode 100644 index dcac6c2..0000000 --- a/pl-5.6.57-locale.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/src/rc/access.c b/src/rc/access.c -index 59f0ef7..27a52dc 100644 ---- a/src/rc/access.c -+++ b/src/rc/access.c -@@ -202,7 +202,7 @@ decode_member_header(RcArchive rca, RcMember mbr) - memset(mbr, 0, sizeof(*mbr)); - - while( html_fd_next_tag(rca->fd, tag, properties) ) -- { if ( strcasecmp(tag, "file") == 0 ) -+ { if ( strmp(tag, "file") == 0 ) - { html_decode_tag(properties, make_file_tag_def(), mbr); - - if ( mbr->name ) -@@ -279,7 +279,7 @@ find_archive_dimensions(RcArchive rca) - { const char *data = rca->data; - size_t alen = strlen(ARCHIVE_TAG); - -- if ( strncasecmp(data, ARCHIVE_TAG, alen) != 0 ) -+ if ( strncmp(data, ARCHIVE_TAG, alen) != 0 ) - { const char *rc_end = &data[rca->size]; - const char *end = rc_end-1; - const char *s; -@@ -298,7 +298,7 @@ find_archive_dimensions(RcArchive rca) - { const char *start = end - len; - rc_size hdrlen = start - (const char *)rca->map_start; - -- if ( strncasecmp(start, ARCHIVE_TAG, alen) == 0 ) -+ if ( strncmp(start, ARCHIVE_TAG, alen) == 0 ) - { rca->data = (void *)start; - rca->size -= hdrlen; - -@@ -327,7 +327,7 @@ at_archive_start(RcArchive rca) - return FALSE; - } - -- if ( strncasecmp(buf, atag, alen) == 0 ) -+ if ( strncmp(buf, atag, alen) == 0 ) - return TRUE; /* fine, this is the start */ - - rc_errno = RCE_NOERROR; -diff --git a/src/rc/build.c b/src/rc/build.c -index 6e148c3..670f1b3 100644 ---- a/src/rc/build.c -+++ b/src/rc/build.c -@@ -3,9 +3,9 @@ - Part of SWI-Prolog - - Author: Jan Wielemaker -- E-mail: jan@swi.psy.uva.nl -+ E-mail: J.Wielemaker@science.uva.nl - WWW: http://www.swi-prolog.org -- Copyright (C): 1985-2002, University of Amsterdam -+ Copyright (C): 1985-2008, University of Amsterdam - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public -@@ -176,16 +176,16 @@ rc_save_data(RcMember m, FILE *fd) - - static int - rc_save_member(RcMember m, FILE *fd) --{ fprintf(fd, "\nname, m->rc_class, m->encoding, (long)m->size); - if ( m->modified ) -- fprintf(fd, " MODIFIED=%ld", (long)m->modified); -+ fprintf(fd, " modified=%ld", (long)m->modified); - fprintf(fd, ">\n"); - - if ( !rc_save_data(m, fd) ) - return FALSE; - -- fprintf(fd, "\n\n"); -+ fprintf(fd, "\n\n"); - - return TRUE; - } -@@ -212,7 +212,7 @@ rc_save_archive(RcArchive rca, const char *to) - hdrlen = hdr->size; - } - -- fprintf(fd, "\n"); -+ fprintf(fd, "\n"); - for( member = rca->members; member; member = member->next ) - { if ( strcmp(member->name, "$header") == 0 && - strcmp(member->rc_class, "$rc") == 0 ) -@@ -223,9 +223,9 @@ rc_save_archive(RcArchive rca, const char *to) - return FALSE; - } - } -- fprintf(fd, "\n"); -+ fprintf(fd, "\n"); - size = ftell(fd) - hdrlen; -- fprintf(fd, "\n", (long)size); -+ fprintf(fd, "\n", (long)size); - if ( fclose(fd) == EOF ) - { rc_errno = RCE_ERRNO; - return FALSE; -diff --git a/src/rc/html.c b/src/rc/html.c -index 29996a4..fb03f0f 100644 ---- a/src/rc/html.c -+++ b/src/rc/html.c -@@ -34,11 +34,6 @@ - #include "html.h" - #include - --#if !defined(strncasecmp) && !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) --#define strcasecmp stricmp --#define strncasecmp strnicmp --#endif -- - #ifndef EOS - #define EOS '\0' - #endif -@@ -76,7 +71,7 @@ html_find_tag(const char *data, const char *end, const char *tag) - if ( data == end ) - return NULL; - -- if ( strncasecmp(data+1, tag, len) == 0 ) -+ if ( strncmp(data+1, tag, len) == 0 ) - { int c = data[len+1]; - - if ( isspace(c) || c == '>' ) -@@ -95,7 +90,7 @@ html_find_close_tag(const char *data, const char *tag) - while(data) - { if ( (data = strchr(data, '<')) && - data[1] == '/' && -- strncasecmp(data+2, tag, len) == 0 && -+ strncmp(data+2, tag, len) == 0 && - data[len+2] == '>' ) - return (char *)data+len+3; - if ( data ) -@@ -240,7 +235,7 @@ html_decode_tag(const char *data, HtmlTagDef spec, void *dest) - } - - for(d=spec; d->tag; d++) -- { if ( strncasecmp(si, d->tag, ei-si) == 0 ) -+ { if ( strncmp(si, d->tag, ei-si) == 0 ) - { void *dst = (char *)dest + d->offset; - - (*d->convert)(sv, ev-sv, dst, d->closure); - diff --git a/pl-5.7.11-jpl-configure.patch b/pl-5.7.11-jpl-configure.patch new file mode 100644 index 0000000..845fb8b --- /dev/null +++ b/pl-5.7.11-jpl-configure.patch @@ -0,0 +1,85 @@ +--- pl-5.7.11/packages/jpl/configure.orig 2009-07-06 10:37:59.561560026 +0100 ++++ pl-5.7.11/packages/jpl/configure 2009-07-06 10:38:02.133810593 +0100 +@@ -3664,21 +3664,6 @@ + CWFLAGS="${CWFLAGS-}" + fi + +-if test "x$JAVALIBS" = "x"; then +- case "$PLARCH" in +- *darwin*) +- JAVALIBS="-Wl,-framework,JavaVM" +- ;; +- *powerpc-linux*) +- JAVALIBS="-ljava -ljvm" +- ;; +- *) +- JAVALIBS="-ljava -lverify -ljvm" +- ;; +- esac +-fi +- +- + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +@@ -4638,15 +4623,25 @@ + _JNI_LIBDIRS="lib/amd64" + _JNI_LIBSUBDIRS="server" + ;; ++ alpha*) ++ _JNI_LIBDIRS="lib/alpha" ++ _JNI_LIBSUBDIRS="server" ++ ;; + powerpc) +- case "$host_os" in +- linux*) +- _JNI_LIBDIRS="lib/ppc bin" +- _JNI_LIBSUBDIRS="server classic" +- ;; +- *) +- _JNI_LIBDIRS="" +- esac ++ _JNI_LIBDIRS="lib/ppc" ++ _JNI_LIBSUBDIRS="server" ++ ;; ++ powerpc64) ++ _JNI_LIBDIRS="lib/ppc64" ++ _JNI_LIBSUBDIRS="server" ++ ;; ++ s390) ++ _JNI_LIBDIRS="lib/s390" ++ _JNI_LIBSUBDIRS="server" ++ ;; ++ s390x) ++ _JNI_LIBDIRS="lib/s390x" ++ _JNI_LIBSUBDIRS="server" + ;; + *) + # Fallback option should work on all architectures except +@@ -4655,6 +4649,26 @@ + _JNI_LIBSUBDIRS="server" + esac + ++# Set JAVALIBS differently if we're using GCJ ++if test "x$JAVALIBS" = "x"; then ++ if (echo $_JTOPDIR | grep gcj > /dev/null); then ++ JAVALIBS="-ljvm" ++ else ++ case "$PLARCH" in ++ *darwin*) ++ JAVALIBS="-Wl,-framework,JavaVM" ++ ;; ++ *powerpc-linux*) ++ JAVALIBS="-ljava -ljvm" ++ ;; ++ *) ++ JAVALIBS="-ljava -lverify -ljvm" ++ ;; ++ esac ++ fi ++fi ++ ++ + for d in $_JNI_LIBDIRS; do + for subd in $_JNI_LIBSUBDIRS; do + echo "Trying $_JTOPDIR/jre/$d/$subd" diff --git a/pl-5.7.11-man-files.patch b/pl-5.7.11-man-files.patch new file mode 100644 index 0000000..fec5339 --- /dev/null +++ b/pl-5.7.11-man-files.patch @@ -0,0 +1,70 @@ +--- pl-5.7.11/src/pl.1.in.orig 2009-07-06 11:38:55.194810616 +0100 ++++ pl-5.7.11/src/pl.1.in 2009-07-06 11:39:53.213766888 +0100 +@@ -333,57 +333,6 @@ + .BR apropos/1 + and + .BR explain/1. +-.RE +-.SH FILES +-This installation of SWI-Prolog has been configured using the configure +-option +-.BI \-\-prefix= @prefix@. +-If the files listed below are not at the indicated place, the installation +-has probably been moved. Use +-.TP +-?- current_prolog_flag(home, Home). +-.P +-to find the local installation directory of SWI-Prolog. +-.TP +-.I .plrc +-.TP +-.I ~/.plrc +-Personal initialisation files consulted by SWI-Prolog on startup. +-If both exist +-.I .plrc +-is used. +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/bin/@ARCH@/ +-Location for the executables. +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/include/ +-Location for the include files. If writable, SWI-Prolog.h is also +-copied to @prefix@/include/SWI-Prolog.h. +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/library/ +-SWI-Prolog user libraries. +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/boot/ +-SWI-Prolog kernel parts written in Prolog. The startup file +-@prefix@/lib/@PL@-@PLVERSION@/boot32.prc may be recreated using +-the command from the directory @prefix@/lib/@PL@-@PLVERSION@: +-.RS +-.TP +-bin/@ARCH@/@PL@ -O -o boot32.prc -b boot/init.pl +-.RE +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/doc/packages +-HTML and/or PDF documentation on the installed add-ons. +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/boot32.prc +-Default startup file. This is a `intermediate code' file containing +-precompiled code from the boot directory. The +-.BI \-x bootfile +-option may be used to select a different file. +-.TP +-.I @prefix@/lib/@PL@-@PLVERSION@/runtime/@ARCH@/libpl.a +-SWI-Prolog library for embedding. See also +-.I plld(1). + .SH SEE ALSO + .PP + The SWI-Prolog web-home at +@@ -393,9 +342,6 @@ + .IR "SWI-Prolog Reference Manual" at + .I http://gollem.science.uva.nl/SWI-Prolog/Manual/ + .PP +-Documentation on the add-on packages in +-.I @prefix@/lib/@PL@-@PLVERSION@/boot/doc +-.PP + William\ F.\ Clocksin & Christopher\ S.\ Mellish, + .IR "Programming in Prolog" , + fourth edition, Springer Verlag, Berlin 1994. diff --git a/pl-5.7.11-rpath.patch b/pl-5.7.11-rpath.patch new file mode 100644 index 0000000..ad77d22 --- /dev/null +++ b/pl-5.7.11-rpath.patch @@ -0,0 +1,23 @@ +--- pl-5.7.11/packages/xpce/pl/src/Makefile.orig 2009-07-06 10:30:39.522810119 +0100 ++++ pl-5.7.11/packages/xpce/pl/src/Makefile 2009-07-06 10:30:52.766810939 +0100 +@@ -114,20 +114,8 @@ + fi + + sopce$(XPCESO): +- if [ "x$$LD_RUN_PATH" = "x" ]; then \ +- LD_RUN_PATH="$(libdir)"; \ +- else \ +- LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ +- fi; \ +- export LD_RUN_PATH; \ + $(PLLD) -shared $(SOITF) $(LDFLAGS) -L$(XLIB) -L$(LIBDIR) -lXPCE -o $(XPCESO); + axpce$(XPCESO): +- if [ "x$$LD_RUN_PATH" = "x" ]; then \ +- LD_RUN_PATH="$(libdir)"; \ +- else \ +- LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \ +- fi; \ +- export LD_RUN_PATH; \ + $(PLLD) -shared $(LDFLAGS) $(SOITF) $(SOEXTR) -L$(LIBDIR) \ + -lXPCE $(GCCLIB) -L$(XLIB) $(XLIBS) $(NETLIBS) -o $(XPCESO); + diff --git a/pl-5.7.6-strndup-no-static.patch b/pl-5.7.6-strndup-no-static.patch deleted file mode 100644 index cb5b205..0000000 --- a/pl-5.7.6-strndup-no-static.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pl-5.7.6/src/mkvmi.c.BAD 2009-06-12 17:02:41.000000000 -0500 -+++ pl-5.7.6/src/mkvmi.c 2009-06-12 17:02:52.000000000 -0500 -@@ -142,7 +142,7 @@ - } - - --static char * -+char * - strndup(const char *in, size_t len) - { char *s = malloc(len+1); - diff --git a/pl.spec b/pl.spec index 4b19eec..0470c8c 100644 --- a/pl.spec +++ b/pl.spec @@ -2,8 +2,8 @@ %define jdkverlong %{jdkvershort}.0 Name: pl -Version: 5.7.6 -Release: 5%{?dist} +Version: 5.7.11 +Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -11,14 +11,12 @@ Group: Development/Languages License: LGPLv2+ URL: http://www.swi-prolog.org Source: http://www.swi-prolog.org/download/devel/src/%{name}-%{version}.tar.gz -Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz -Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz -Patch0: %{name}-5.4.6-rpath.patch -Patch1: %{name}-5.6.57-jpl-configure.patch -Patch2: %{name}-5.6.57-jpl-configure-alpha.patch +Source1: http://www.swi-prolog.org/download/devel/doc/SWI-Prolog-%{version}.pdf +Source2: http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz +Patch0: %{name}-5.7.11-rpath.patch +Patch1: %{name}-5.7.11-jpl-configure.patch +Patch2: %{name}-5.7.11-man-files.patch Patch3: %{name}-5.6.60-jni.patch -Patch4: %{name}-5.6.57-jpl-configure-s390x.patch -Patch5: pl-5.7.6-strndup-no-static.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gmp-devel @@ -103,19 +101,18 @@ in Prolog. In both setups it provides a reentrant bidirectional interface. %setup -q %patch0 -p1 -b .rpath %patch1 -p1 -b .libjvm -%patch2 -p1 -b .libjvm-alpha +%patch2 -p1 -b .man-files %patch3 -p1 -b .jni -%patch4 -p1 -b .libjvm-s390X -%patch5 -p1 -b .strndup-no-static ( mkdir doc-install cd doc-install - tar zxf %{SOURCE1} + cp -p %{SOURCE1} . ) ( mkdir xpce-doc cd xpce-doc tar zxf %{SOURCE2} + mv UserGuide xpce-UserGuide ) # Adjustments to take into account the new location of JNI stuff @@ -144,6 +141,14 @@ make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH=$PWD/src:$PATH cd packages %configure +cd clib/maildrop +for dir in rfc*; do +pushd $dir +%configure +sed --in-place=.pic -e 's/CFLAGS=/CFLAGS=-fPIC /' Makefile +popd +done +cd ../.. make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" JAVALIBS="-L$JAVA_LIB/server -L$JAVA_LIB -ljava -lverify -ljvm" cd .. @@ -178,6 +183,11 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include +# Move the binaries into %{_bindir} directly instead of using links +rm -f $RPM_BUILD_ROOT%{_bindir}/* +mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin/*/* $RPM_BUILD_ROOT%{_bindir} +rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin + # Clean up the other stuff that shouldn't be packaged rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/man rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/doc @@ -243,6 +253,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 6 2009 Mary Ellen Foster - 5.7.11-1 +- Move binaries into /usr/bin directly to fix multilib issues +- Update to latest upstream release +- Use officially-distributed PDF documentation instead of HTML +- Unify Java patches +- Remove strndup package; they fixed it upstream +- Fix compilation of "maildrop" packages +- Give the xpce documentation directory a clearer name +- Removed the FILES section of the man page because it also caused + multilib conflicts (and was inaccurate anyway) + * Fri Jun 12 2009 Dennis Gilmore 5.7.6-5 -dont use a static definition for strndup diff --git a/sources b/sources index 6b07afe..78a23e5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2569fae9f1fa61ccd12cde9b0434b1c8 pl-5.7.6.tar.gz -1da5a1eab8c4577f1948540d28144a38 HTMLmanual.tar.gz a4462019611caa4f69247c8bf94404a7 userguide.html.tgz +b2bc17a08a462ee8168407b52c28bd40 pl-5.7.11.tar.gz +ba7ff9da608a3986867cecbae27f51dd SWI-Prolog-5.7.11.pdf