[pl] 5.10.2 bump
Petr Pisar
ppisar at fedoraproject.org
Thu Dec 16 15:42:23 UTC 2010
commit e33c09b6946caeb2d09ec49ab12e3d788e95a686
Author: Petr Písař <ppisar at redhat.com>
Date: Fri Dec 10 10:39:46 2010 +0100
5.10.2 bump
This is early spec to provide new version compilable in F15.
A lot of clean-ups must follow including patches adjustment.
.gitignore | 2 +
pl.spec | 152 +++++++++++++++++++++++++++++++++---------------------------
sources | 5 +-
3 files changed, 87 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index db3f12b..0f332fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
userguide.html.tgz
pl-5.7.11.tar.gz
SWI-Prolog-5.7.11.pdf
+/pl-5.10.2.tar.gz
+/SWI-Prolog-5.10.2.pdf
diff --git a/pl.spec b/pl.spec
index d1d0f4d..087d2aa 100644
--- a/pl.spec
+++ b/pl.spec
@@ -5,8 +5,8 @@
%define jdkverlong %{jdkvershort}.0
Name: pl
-Version: 5.7.11
-Release: 6%{?dist}
+Version: 5.10.2
+Release: 1%{?dist}
Summary: SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -19,9 +19,9 @@ Group: Development/Languages
#packages/http/examples/calc.pl Public Domain
License: Artistic and LGPLv2 and GPLv2 and GPLv2+ and UCD and Public Domain
URL: http://www.swi-prolog.org
-Source: http://www.swi-prolog.org/download/devel/src/%{name}-%{version}.tar.gz
-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
+Source: http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
+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
Patch0: %{name}-5.7.11-rpath.patch
Patch1: %{name}-5.7.11-jpl-configure.patch
Patch2: %{name}-5.7.11-man-files.patch
@@ -29,28 +29,37 @@ Patch3: %{name}-5.6.60-jni.patch
Patch4: %{name}-5.7.11-pc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Base
+BuildRequires: chrpath
BuildRequires: gmp-devel
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
+BuildRequires: readline-devel
+# XPCE
BuildRequires: libICE-devel
+BuildRequires: libjpeg-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
-BuildRequires: libXaw-devel
-BuildRequires: libXext-devel
BuildRequires: libXft-devel
BuildRequires: libXinerama-devel
-BuildRequires: libXmu-devel
BuildRequires: libXpm-devel
-BuildRequires: libXrender-devel
BuildRequires: libXt-devel
-BuildRequires: libjpeg-devel
-BuildRequires: openssl-devel
-BuildRequires: pkgconfig
-BuildRequires: readline-devel
+#BuildRequires: freetype-devel
+#BuildRequires: libXaw-devel
+#BuildRequires: libXext-devel
+#BuildRequires: libXmu-devel
+#BuildRequires: libXrender-devel
+# ODBC
BuildRequires: unixODBC-devel
-BuildRequires: freetype-devel
+# SSL
+BuildRequires: openssl-devel
+# jpl
%if %{with_java}
BuildRequires: jpackage-utils
BuildRequires: java-%{jdkvershort}-devel = 1:%{jdkverlong}
%endif
+# zlib
+BuildRequires: zlib-devel
%description
ISO/Edinburgh-style Prolog compiler including modules, auto-load,
@@ -60,6 +69,7 @@ GNU-readline interface, very fast compiler. Including packages clib
XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
toolkit, integrated editor (Emacs-clone) and source-level debugger).
+
%package devel
Summary: Development files for SWI Prolog
Group: Development/Languages
@@ -79,6 +89,7 @@ Requires: readline-devel
%description static
Static library for SWI Prolog.
+
%if %{separate_xpce}
%package xpce
Summary: A toolkit for developing graphical applications in Prolog
@@ -115,22 +126,22 @@ in Prolog. In both setups it provides a reentrant bidirectional interface.
%prep
%setup -q
-%patch0 -p1 -b .rpath
-%patch1 -p1 -b .libjvm
-%patch2 -p1 -b .man-files
-%patch3 -p1 -b .jni
-%patch4 -p1 -b .pc
+#%patch0 -p1 -b .rpath
+#%patch1 -p1 -b .libjvm
+#%patch2 -p1 -b .man-files
+#%patch3 -p1 -b .jni
+#%patch4 -p1 -b .pc
(
mkdir doc-install
cd doc-install
cp -p %{SOURCE1} .
)
-(
- mkdir xpce-doc
- cd xpce-doc
- tar zxf %{SOURCE2}
- mv UserGuide xpce-UserGuide
-)
+#(
+# mkdir xpce-doc
+# cd xpce-doc
+# tar zxf %{SOURCE2}
+# mv UserGuide xpce-UserGuide
+#)
# Adjustments to take into account the new location of JNI stuff
sed --in-place=.jni2 -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl
@@ -161,10 +172,10 @@ export DISABLE_PKGS="jpl"
%configure --enable-shared
make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-cd packages
+pushd packages
%configure
make COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" JAVALIBS="-L$JAVA_LIB/server -L$JAVA_LIB -ljava -lverify -ljvm"
-cd ..
+popd
%install
@@ -172,11 +183,11 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_prefix}
%makeinstall
# Library must be executable to get its debuginfo
-chmod 0755 $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/*/libpl.so.*
+#chmod 0755 $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/*/libswipl.so.*
pushd packages
PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make rpm-install \
- PLBASE=$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \
+ PLBASE=$RPM_BUILD_ROOT%{_libdir}/swipl-%{version} \
prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} \
libdir=$RPM_BUILD_ROOT%{_libdir} \
@@ -188,32 +199,32 @@ popd
%if %{with_java}
# Move the JPL JNI stuff to where the Java packaging guidelines
# say it should be
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/*/libjpl.so \
- $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/lib/jpl.jar \
- $RPM_BUILD_ROOT%{_libdir}/%{name}-jpl/
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/swipl-jpl
+mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/*/libjpl.so \
+ $RPM_BUILD_ROOT%{_libdir}/swipl-jpl/
+mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/jpl.jar \
+ $RPM_BUILD_ROOT%{_libdir}/swipl-jpl/
%endif
%if %{separate_xpce}
# Move the various include files into /usr/include
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include/*.h \
- $RPM_BUILD_ROOT%{_includedir}/%{name}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include/* \
- $RPM_BUILD_ROOT%{_includedir}/%{name}/xpce
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/swipl/xpce
+mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include/*.h \
+ $RPM_BUILD_ROOT%{_includedir}/swipl
+#mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/xpce-*/include/* \
+# $RPM_BUILD_ROOT%{_includedir}/swipl/xpce
+rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/include
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/xpce-*/include
%endif
# 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
+mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/bin/*/* $RPM_BUILD_ROOT%{_bindir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{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
+rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/man
+rm -rf $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/doc
rm -rf $RPM_BUILD_ROOT%{_mandir}/man3/readline*
find packages/jpl/examples -name "*.class" | xargs rm -f
find packages/jpl/examples -name ".cvsignore" | xargs rm -f
@@ -225,33 +236,33 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc ChangeLog README COPYING VERSION
+%doc ReleaseNotes/relnotes-5.10 README COPYING VERSION
%doc dotfiles/dotplrc
%doc doc-install/*
-%doc xpce-doc/*
+#%doc xpce-doc/*
%{_mandir}/man1/*
-%dir %{_libdir}/%{name}-%{version}
-%{_libdir}/%{name}-%{version}/*
+%dir %{_libdir}/swipl-%{version}
+%{_libdir}/swipl-%{version}/*
%{_bindir}/*
# Exclude the files that are in the sub-packages
%if %{with_java}
# JPL
-%exclude %{_libdir}/%{name}-%{version}/library/jpl.pl
+%exclude %{_libdir}/swipl-%{version}/library/jpl.pl
%endif
# Devel
-%exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.so
-%exclude %{_libdir}/%{name}-%{version}/include
-%exclude %{_libdir}/%{name}-%{version}/xpce-*/include
+%exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.so
+%exclude %{_libdir}/swipl-%{version}/include
+#%exclude %{_libdir}/swipl-%{version}/xpce-*/include
# Static
-%exclude %{_libdir}/%{name}-%{version}/lib/*/libpl.a
+%exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.a
%if %{separate_xpce}
# XPCE
%exclude %{_bindir}/xpce*
-%exclude %{_libdir}/%{name}-%{version}/bin/*/xpce
-%exclude %{_libdir}/%{name}-%{version}/dotfiles/dotxpcerc
-%exclude %{_libdir}/%{name}-%{version}/xpce*
-%exclude %{_libdir}/%{name}-%{version}/library/http/xpce_httpd.pl
+%exclude %{_libdir}/swipl-%{version}/bin/*/xpce
+%exclude %{_libdir}/swipl-%{version}/dotfiles/dotxpcerc
+%exclude %{_libdir}/swipl-%{version}/xpce*
+%exclude %{_libdir}/swipl-%{version}/library/http/xpce_httpd.pl
%endif
%if %{separate_xpce}
@@ -260,34 +271,37 @@ rm -rf $RPM_BUILD_ROOT
%doc xpce-doc/*
%doc dotfiles/dotxpcerc
%{_bindir}/xpce*
-%{_includedir}/%{name}/xpce
-%{_libdir}/%{name}-%{version}/bin/*/xpce
-%{_libdir}/%{name}-%{version}/xpce*
-%{_libdir}/%{name}-%{version}/library/http/xpce_httpd.pl
+%{_includedir}/swipl/xpce
+%{_libdir}/swipl-%{version}/bin/*/xpce
+%{_libdir}/swipl-%{version}/xpce*
+%{_libdir}/swipl-%{version}/library/http/xpce_httpd.pl
%endif
%files devel
%defattr(-,root,root,-)
-%{_libdir}/%{name}-%{version}/include
-%{_libdir}/%{name}-%{version}/xpce-*/include
-%{_libdir}/%{name}-%{version}/lib/*/libpl.so
-%{_libdir}/pkgconfig/pl.pc
+%{_libdir}/swipl-%{version}/include
+#%{_libdir}/swipl-%{version}/xpce-*/include
+%{_libdir}/swipl-%{version}/lib/*/libswipl.so
+%{_libdir}/pkgconfig/swipl.pc
%files static
%defattr(-,root,root,-)
-%{_libdir}/%{name}-%{version}/lib/*/libpl.a
+%{_libdir}/swipl-%{version}/lib/*/libswipl.a
%if %{with_java}
%files jpl
%defattr(-,root,root,-)
%doc packages/jpl/docs/*
%doc packages/jpl/examples
-%{_libdir}/%{name}-%{version}/library/jpl.pl
-%{_libdir}/%{name}-jpl
+%{_libdir}/swipl-%{version}/library/jpl.pl
+%{_libdir}/swipl-jpl
%endif
%changelog
+* Thu Dec 09 2010 Petr Pisar <ppisar at redhat.com> - 5.10.2-1
+- 5.10.2 bump
+
* Wed Dec 8 2010 Petr Pisar <ppisar at redhar.com> - 5.7.11-6
- Inhibit XPCE by macro to silent rpmlint
- Define implicit attributes for jpl files
diff --git a/sources b/sources
index 78a23e5..f4d681b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-a4462019611caa4f69247c8bf94404a7 userguide.html.tgz
-b2bc17a08a462ee8168407b52c28bd40 pl-5.7.11.tar.gz
-ba7ff9da608a3986867cecbae27f51dd SWI-Prolog-5.7.11.pdf
+7973bcfd3854ae0cb647cc62f2faabcf pl-5.10.2.tar.gz
+7a223c66d606b10a06a277150f5f5fde SWI-Prolog-5.10.2.pdf
More information about the scm-commits
mailing list