diff --git a/pl-5.10.2-man-files.patch b/pl-5.10.2-man-files.patch new file mode 100644 index 0000000..6cc7ca5 --- /dev/null +++ b/pl-5.10.2-man-files.patch @@ -0,0 +1,72 @@ +diff --git a/src/swipl.1.in b/src/swipl.1.in +index 8754a3d..0ba8a26 100644 +--- a/src/swipl.1.in ++++ b/src/swipl.1.in +@@ -323,57 +323,6 @@ to + .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 +@@ -383,9 +332,6 @@ Jan\ Wielemaker + .IR "SWI-Prolog Reference Manual" at + .I http://www.swi-prolog.org/pldoc/index.html + .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-man-files.patch b/pl-5.7.11-man-files.patch deleted file mode 100644 index fec5339..0000000 --- a/pl-5.7.11-man-files.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- 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.spec b/pl.spec index 11fdbc2..d35e95f 100644 --- a/pl.spec +++ b/pl.spec @@ -23,7 +23,7 @@ Source: http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar Source1: http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-%{version}.pdf #Source2: http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz Patch1: %{name}-5.10.2-jpl-configure.patch -Patch2: %{name}-5.7.11-man-files.patch +Patch2: %{name}-5.10.2-man-files.patch Patch3: %{name}-5.6.60-jni.patch Patch4: %{name}-5.7.11-pc.patch @@ -125,7 +125,7 @@ in Prolog. In both setups it provides a reentrant bidirectional interface. %prep %setup -q %patch1 -p1 -b .libjvm -#%patch2 -p1 -b .man-files +%patch2 -p1 -b .man-files #%patch3 -p1 -b .jni #%patch4 -p1 -b .pc ( @@ -300,6 +300,7 @@ rm -rf $RPM_BUILD_ROOT - 5.10.2 bump - Use DT_RUNPATH instead of pl-5.7.11-rpath.patch - Adjust jpl-configure.patch to 5.10.2 +- Adjust man-files.patch to 5.10.2 * Wed Dec 8 2010 Petr Pisar - 5.7.11-6 - Inhibit XPCE by macro to silent rpmlint