---- Yap-4.4.4.pre/Makefile.in 2003-09-10 17:51:53.000000000 +0000
-+++ Yap-4.4.4/Makefile.in 2004-10-19 05:08:41.901971152 +0000
-@@ -8,24 +8,24 @@
+--- yap-6.2.2/Makefile.in.orig 2011-10-20 23:17:58.000000000 +0200
++++ yap-6.2.2/Makefile.in 2012-03-28 19:44:30.763163899 +0200
+@@ -9,7 +9,7 @@
#
# where the binary should be
#
#
# where YAP should look for binary libraries
#
--LIBDIR=$(EROOTDIR)/lib
--YAPLIBDIR=$(EROOTDIR)/lib/Yap
-+LIBDIR=@libdir@
-+YAPLIBDIR=@libdir@/Yap
+@@ -18,15 +18,15 @@
#
# where YAP should look for architecture-independent Prolog libraries
#
#
-INFODIR=$(SHAREDIR)/info
+INFODIR=@infodir@
-
#
- # Add this flag to YAP_EXTRAS if you need the extension:
-diff -ur Yap-4.5.4.pre/library/mpi/Makefile.in Yap-4.5.4/library/mpi/Makefile.in
---- Yap-4.5.4.pre/library/mpi/Makefile.in 2004-12-09 21:38:49.420824632 +0000
-+++ Yap-4.5.4/library/mpi/Makefile.in 2004-12-09 21:39:06.391244736 +0000
-@@ -21,7 +21,7 @@
- # where YAP should look for binary libraries
- #
- LIBDIR=$(EROOTDIR)/lib
--YAPLIBDIR=$(EROOTDIR)/lib/Yap
-+YAPLIBDIR=@libdir@/Yap
- #
- # where YAP should look for architecture-independent Prolog libraries
- #
-diff -ur Yap-4.5.4.pre/library/random/Makefile.in Yap-4.5.4/library/random/Makefile.in
---- Yap-4.5.4.pre/library/random/Makefile.in 2004-12-09 21:38:49.420824632 +0000
-+++ Yap-4.5.4/library/random/Makefile.in 2004-12-09 21:39:06.392244584 +0000
-@@ -12,7 +12,7 @@
- #
- # where YAP should look for libraries
- #
--LIBDIR=$(EROOTDIR)/lib/Yap
-+LIBDIR=@libdir@/Yap
- #
- #
- CC=@CC@
-diff -ur Yap-4.5.4.pre/library/regex/Makefile.in Yap-4.5.4/library/regex/Makefile.in
---- Yap-4.5.4.pre/library/regex/Makefile.in 2004-12-09 21:38:49.424824024 +0000
-+++ Yap-4.5.4/library/regex/Makefile.in 2004-12-09 21:39:06.392244584 +0000
-@@ -12,7 +12,7 @@
- #
- # where YAP should look for libraries
- #
--LIBDIR=$(EROOTDIR)/lib/Yap
-+LIBDIR=@libdir@/Yap
+ # where to store documentation files
#
+--- yap-6.2.2/library/Makefile.in.orig 2011-02-03 12:25:28.000000000 +0100
++++ yap-6.2.2/library/Makefile.in 2012-03-28 19:49:09.476500101 +0200
+@@ -5,7 +5,7 @@
#
- CC=@CC@
-diff -ur Yap-4.5.4.pre/library/system/Makefile.in Yap-4.5.4/library/system/Makefile.in
---- Yap-4.5.4.pre/library/system/Makefile.in 2004-12-09 21:38:49.436822200 +0000
-+++ Yap-4.5.4/library/system/Makefile.in 2004-12-09 21:39:06.393244432 +0000
-@@ -12,7 +12,7 @@
- #
- # where YAP should look for libraries
- #
--LIBDIR=$(EROOTDIR)/lib/Yap
-+LIBDIR=@libdir@/Yap
- #
- #
- CC=@CC@
-diff -ur Yap-4.5.4.pre/library/Tries/Makefile.in Yap-4.5.4/library/Tries/Makefile.in
---- Yap-4.5.4.pre/library/Tries/Makefile.in 2004-12-09 21:38:49.403827216 +0000
-+++ Yap-4.5.4/library/Tries/Makefile.in 2004-12-09 21:39:06.390244888 +0000
-@@ -18,7 +18,7 @@
- #
- # where YAP should look for libraries
+ # where the binary should be
#
--LIBDIR=$(EROOTDIR)/lib/Yap
-+LIBDIR=@libdir@/Yap
+-BINDIR = $(ROOTDIR)/bin
++BINDIR = @bindir@
#
+ # where YAP should look for binary libraries
#
- CC=@CC@
-diff -ur Yap-4.5.4.pre/library/yap2swi/Makefile.in Yap-4.5.4/library/yap2swi/Makefile.in
---- Yap-4.5.4.pre/library/yap2swi/Makefile.in 2004-12-09 21:38:49.436822200 +0000
-+++ Yap-4.5.4/library/yap2swi/Makefile.in 2004-12-09 21:39:06.394244280 +0000
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
#
- # where YAP should look for libraries
+ # where YAP should look for architecture-independent Prolog libraries
#
--LIBDIR=$(EROOTDIR)/lib/Yap
-+LIBDIR=@libdir@/Yap
+-SHAREDIR=$(ROOTDIR)/share
++SHAREDIR=@datadir@
#
#
- CC=@CC@
+ # You shouldn't need to change what follows.
---- Yap-4.5.5/docs/yap.tex.orig 2004-12-14 18:00:28.000000000 +0100
-+++ Yap-4.5.5/docs/yap.tex 2004-12-24 17:00:36.000000000 +0100
+--- yap-6.2.2/docs/yap.tex.orig 2011-08-19 17:08:29.000000000 +0200
++++ yap-6.2.2/docs/yap.tex 2012-03-28 20:51:18.609960843 +0200
@@ -33,9 +33,9 @@
@ifnottex
-@dircategory The YAP Prolog System
+@dircategory Programming Languages:
@direntry
--* Yap: (yap). YAP Prolog User's Manual.
-+* Yap: (yap). YAP Prolog User's Manual
+-* YAP: (yap). YAP Prolog User's Manual.
++* YAP: (yap). YAP Prolog User's Manual
@end direntry
@end format
@end ifnottex
+--- yap-6.2.2/LGPL/pillow/doc/pillow_doc.info.orig 2010-10-18 10:48:20.000000000 +0200
++++ yap-6.2.2/LGPL/pillow/doc/pillow_doc.info 2012-03-29 18:40:39.032595187 +0200
+@@ -2,8 +2,7 @@
+ pillow_doc.texi.
+
+ START-INFO-DIR-ENTRY
+-* pillow: (pillow_doc.info).
+- The PiLLoW Web Programming Library
++* pillow: (pillow_doc.info). The PiLLoW Web Programming Library
+ END-INFO-DIR-ENTRY
+
+ The PiLLoW library ("Programming in Logic Languages on the Web")
---- Yap-4.5.5/configure.in.orig 2004-12-14 18:00:25.000000000 +0100
-+++ Yap-4.5.5/configure.in 2004-12-24 16:17:15.000000000 +0100
-@@ -335,18 +335,18 @@
- else
+--- yap-6.2.2/configure.in.orig 2011-10-24 00:11:26.000000000 +0200
++++ yap-6.2.2/configure.in 2012-03-28 20:41:12.536611558 +0200
+@@ -603,31 +603,31 @@
INSTALL_COMMAND="install_unix"
+ ENABLE_WINCONSOLE="#"
AC_CHECK_LIB(m,sin)
- AC_CHECK_LIB(socket,socket)
+ AC_SEARCH_LIBS(socket,socket)
dnl X/Open Networking is sometimes a separate library
- AC_CHECK_LIB(xnet,getsockname)
+ AC_SEARCH_LIBS(getsockname,xnet)
+ AC_CHECK_LIB(stdc++,main)
+ AC_CHECK_FUNC(gethostbyname, , [
AC_CHECK_LIB(nsl,main,
have_nsl=yes
,
have_nsl=no)
+ ])
+ AC_CHECK_LIB(crypt,main)
+- AC_CHECK_LIB(nss_files,main)
+- AC_CHECK_LIB(nss_dns,main)
+- AC_CHECK_LIB(resolv,main)
++ AC_SEARCH_LIBS(gethostbyname,resolv)
fi
if test "$yap_cv_readline" != "no"
then
-- AC_CHECK_LIB(termcap,tgetent)
-- AC_CHECK_LIB(ncurses,main)
- AC_CHECK_LIB(readline,readline)
+ AC_CHECK_LIB([readline], [main],[
+ AC_DEFINE([HAVE_LIBREADLINE], [1],[Define if you have libreadline])
+- LIBS="$LIBS -lreadline -lncurses"
++ LIBS="$LIBS -lreadline"
+ ],
+ [if test "x$with_readline" != xcheck; then
+ AC_MSG_FAILURE(
+ [--with-readline was given, but test for readline failed])
+ fi
+- ], -lncurses)
++ ])
fi
+ if test "$yap_cv_gmp" != "no"
+ then
+++ /dev/null
---- Yap-4.5.4/C/absmi.c.orig 2004-12-05 06:01:21.000000000 +0100
-+++ Yap-4.5.4/C/absmi.c 2004-12-10 00:36:45.000000000 +0100
-@@ -265,7 +265,7 @@
- return;
- }
- #endif
-- fprintf(FProf,"0 %p\n", PREG);
-+ fprintf(FProf,"0 %p\n", P);
- return;
- }
-
---- Yap-4.5.4/C/threads.c.orig 2004-12-02 06:58:58.000000000 +0100
-+++ Yap-4.5.4/C/threads.c 2004-12-10 01:28:09.000000000 +0100
-@@ -201,7 +201,7 @@
- return Yap_unify(MkIntegerTerm(worker_id), ARG1);
- }
-
--int
-+Int
- Yap_thread_self(void)
- {
- if (pthread_getspecific(Yap_yaamregs_key) == NULL)
-@@ -209,7 +209,7 @@
- return worker_id;
- }
-
--int
-+Int
- Yap_thread_create_engine(thread_attr *ops)
- {
- int new_id = allocate_new_tid();
-@@ -225,7 +225,7 @@
- return TRUE;
- }
-
--int
-+Int
- Yap_thread_attach_engine(int wid)
- {
- pthread_mutex_lock(&(ThreadHandle[wid].tlock));
-@@ -241,7 +241,7 @@
- return TRUE;
- }
-
--int
-+Int
- Yap_thread_detach_engine(int wid)
- {
- pthread_mutex_lock(&(ThreadHandle[wid].tlock));
-@@ -252,7 +252,7 @@
- return TRUE;
- }
-
--int
-+Int
- Yap_thread_destroy_engine(int wid)
- {
- pthread_mutex_lock(&(ThreadHandle[wid].tlock));
+# TODO: liblam (MPI) or MPE
Summary: Prolog Compiler
Summary(pl.UTF-8): Kompilator Prologu
Name: Yap
-Version: 4.5.5
-Release: 3
+Version: 6.2.2
+Release: 1
License: Artistic
Group: Development/Languages
-Source0: http://dl.sourceforge.net/yap/%{name}-%{version}.tar.gz
-# Source0-md5: 661e289f4bdac0e6cfc7e59d4421c2a8
+Source0: http://www.dcc.fc.up.pt/~vsc/Yap/yap-%{version}.tar.gz
+# Source0-md5: 95eaa54978e4811ff6e504e7dca9e835
Patch0: %{name}-acdirs.patch
-Patch1: %{name}-port.patch
-Patch2: %{name}-nolibs.patch
-Patch3: %{name}-info.patch
-URL: http://www.ncc.up.pt/~vsc/Yap/
-BuildRequires: autoconf
+Patch1: %{name}-nolibs.patch
+Patch2: %{name}-info.patch
+URL: http://www.dcc.fc.up.pt/~vsc/Yap/
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: gmp-devel
BuildRequires: indent
+BuildRequires: mysql-devel
BuildRequires: readline-devel
+BuildRequires: rpmbuild(macros) >= 1.566
+BuildRequires: sed >= 4.0
BuildRequires: texinfo
+BuildRequires: unixODBC-devel
+BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# follow configure
-%define specflags_ia32 -DBP_FREE
-
%description
A high-performance Prolog compiler developed at LIACC, Universidade do
Porto. The Prolog engine is based in the WAM (Warren Abstract
Statyczna biblioteka dla kompilatora prologu YAP.
%prep
-%setup -q
+%setup -q -n yap-%{version}
+%undos configure.in
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
cp -f /usr/share/automake/config.sub .
%{__aclocal}
%{__autoconf}
-CFLAGS="%{rpmcflags}%{!?debug: -fomit-frame-pointer} -Wall"
%configure \
- C_INTERF_FLAGS="%{rpmcflags} -Wall" \
- C_PARSER_FLAGS="%{rpmcflags} -Wall" \
--enable-coroutining \
%{?debug:--enable-debug-yap} \
--enable-depth-limit \
%{__make}
-%{__make} -C docs info
+%{__make} info
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_infodir},%{_examplesdir}/%{name}-%{version},%{_libdir}/%{name}}
-%{__make} install \
+%{__make} install install_info \
DESTDIR=$RPM_BUILD_ROOT
-install docs/*info* $RPM_BUILD_ROOT%{_infodir}
+mv -f $RPM_BUILD_ROOT%{_datadir}/Yap/clpbn/examples \
+ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/clpbn
+
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/web/css
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/Yap
-for d in chr clpqr; do
- mv -f $RPM_BUILD_ROOT%{_datadir}/Yap/$d/examples \
- $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$d
-done
+%clean
+rm -rf $RPM_BUILD_ROOT
%post
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-/sbin/ldconfig
%postun
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-/sbin/ldconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README* changes4.3.html docs/yap.tex
+%doc README* changes*.html docs/yap.tex
%attr(755,root,root) %{_bindir}/yap
%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/*.so
-%attr(755,root,root) %{_libdir}/%{name}/startup
+%attr(755,root,root) %{_libdir}/%{name}/startup.yss
%{_datadir}/%{name}
%{_includedir}/%{name}
-%{_infodir}/*info*
+%{_infodir}/pillow_doc.info*
+%{_infodir}/yap.info*
%{_examplesdir}/%{name}-%{version}
%files static
projects / packages / Yap.git / commitdiff