- starting upgrade to 5.0.8

- nfy

Changed files:
    pl.spec -> 1.33

diff --git a/pl.spec b/pl.spec
index f185a69dda6c059215b5d1750fb6017db051f0f5..6ad25b53ba4d420ef5969673150b68c19e20ca16 100644 (file)
--- a/pl.spec
+++ b/pl.spec
@@ -1,24 +1,29 @@
 Summary:       SWI Prolog Language
 Summary(pl):   Jêzyk SWI Prolog
 Name:          pl
-Version:       3.4.2
-Release:       4
+Version:       5.0.8
+Release:       1
 License:       GPL
 Group:         Development/Languages
-Source0:       ftp://metalab.unc.edu/pub/Linux/devel/lang/prolog/swi/%{name}-%{version}.tar.gz
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-readline.patch
-BuildRequires: ncurses-devel
-BuildRequires: readline-devel >= 4.2
+Source0:       http://www.swi.psy.uva.nl/cgi-bin//nph-download/SWI-Prolog/%{name}-%{version}.tar.gz
+#Patch0:               %{name}-DESTDIR.patch
+#Patch1:               %{name}-readline.patch
+Patch0:                %{name}-smp.patch
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: ncurses-devel
+BuildRequires: readline-devel >= 4.2
+Url:           http://www.swi-prolog.org/
+Obsoletes:     swi-prolog
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Edinburgh-style Prolog compiler including modules, autoload,
-libraries, Garbage-collector, stack-expandor, C-interface,
-GNU-readline and GNU-Emacs interface, very fast compiler, X11
-interface using XPCE (info: ftp swi.psy.uva.nl:/pub/xpce)
+ISO/Edinburgh-style Prolog compiler including modules, autoload, libraries,
+Garbage-collector, stack-expandor, C/C++-interface, GNU-readline interface,
+very fast compiler.  Including packages clib (Unix process control and
+sockets), cpp (C++ interface), sgml (reading XML/SGML), sgml/RDF (reading RDF
+into triples) and XPCE (Graphics UI toolkit, integrated editor (Emacs-clone)
+and source-level debugger).
 
 %description -l pl
 Kompilator jêzyka PROLOG w stylu Edinburgh wraz z modu³ami,
@@ -27,45 +32,57 @@ readline, GNU Emacsa i X11 przy u
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p0
+#%patch1 -p1
 
 %build
 cd src
 aclocal
 %{__autoconf}
-%configure2_13
+%configure
+%{__make}
+cd ..
+
+cd packages 
+aclocal
+%{__autoconf}
+%configure
 %{__make}
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-
+install -d $RPM_BUILD_ROOT/usr/
 cd src
-%{__make} install install-bins install-arch install-libs \
-       DESTDIR=$RPM_BUILD_ROOT
+make install \
+        prefix=$RPM_BUILD_ROOT/usr \
+        bindir=$RPM_BUILD_ROOT/usr/bin \
+        mandir=$RPM_BUILD_ROOT%{_mandir}
 cd ..
+install -d $RPM_BUILD_ROOT/usr/lib/pl-%{version}/doc/
 
-(cd $RPM_BUILD_ROOT%{_bindir} ;\
-rm -f * ;\
-ln -s %{_libdir}/pl-%{version}/bin/%{_target_cpu}-linux/pl pl ;\
-ln -s %{_libdir}/pl-%{version}/bin/%{_target_cpu}-linux/pl-bite pl-bite ;\
-ln -s %{_libdir}/pl-%{version}/bin/%{_target_cpu}-linux/plld plld ;\
-ln -s %{_libdir}/pl-%{version}/bin/%{_target_cpu}-linux/plrc plrc )
+cd packages
+  PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make install \
+        PLBASE=$RPM_BUILD_ROOT/usr/lib/pl-%{version} \
+        prefix=$RPM_BUILD_ROOT/usr \
+        bindir=$RPM_BUILD_ROOT/usr/bin \
+        mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+cd ..
 
-mv $RPM_BUILD_ROOT/%{_libdir}/pl-%{version}/library/MANUAL .
+# why are manpages installed twice?
+rm -rf $RPM_BUILD_ROOT/usr/lib/pl-%{version}/man
 
-gzip -9nf README* LSM ChangeLog PORTING MANUAL
+mv $RPM_BUILD_ROOT/%{_libdir}/pl-%{version}/library/MANUAL .
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README*.gz LSM.gz ChangeLog.gz PORTING.gz MANUAL.gz
+%doc README* LSM ChangeLog PORTING MANUAL
 %attr(755,root,root)%{_bindir}/pl
-%attr(755,root,root)%{_bindir}/pl-bite
+#%attr(755,root,root)%{_bindir}/pl-bite
 %attr(755,root,root)%{_bindir}/plld
 %attr(755,root,root)%{_bindir}/plrc
 %{_libdir}/pl-%{version}/
-%{_mandir}/man1/*.1*
+%{_mandir}/man?/*