Author: baggins Date: Wed Mar 11 10:46:29 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- BR java-sun
- added java bcond
- don't build java bindings on archs not supported by java-sun
---- Files affected:
SPECS:
pl.spec (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SPECS/pl.spec
diff -u SPECS/pl.spec:1.73 SPECS/pl.spec:1.74
--- SPECS/pl.spec:1.73 Tue Mar 10 19:16:54 2009
+++ SPECS/pl.spec Wed Mar 11 11:46:23 2009
@@ -3,6 +3,14 @@
# TODO
# - separate prolog packages to rpm subpackages
#
+# Conditional build:
+%bcond_with java # build with java bindings (So far, JPL only
works with Sun Java and IBM Java)
+#
+
+%ifnarch %{x8664} i586 i686 pentium3 pentium4 athlon
+%undefine with_java
+%endif
+
%define xpce_version 6.6.64
Summary: SWI Prolog Language
Summary(pl.UTF-8): Język SWI Prolog
@@ -14,6 +22,7 @@
Source0:
http://www.swi-prolog.org/download/devel/src/%{name}-%{version}.tar.gz
# Source0-md5: a88409ccbbaccb470a0defb64d8cdfda
Patch0: %{name}-clib-configure.patch
+Patch1: %{name}-jpl-configure.patch
URL: http://www.swi-prolog.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -21,7 +30,7 @@
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
BuildRequires: gmp-devel
-BuildRequires: jdk
+%{?with_java:BuildRequires: java-sun}
BuildRequires: libjpeg-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
@@ -81,7 +90,7 @@
%prep
%setup -q
%patch0 -p1
-#sed -e "s...@mkdir@mkdir -...@g" -i packages/xpce/src/Makefile.in
+%patch1 -p1
%build
cd src
@@ -121,7 +130,7 @@
LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}/pl-%{version}/lib/%{_target_cpu}-linux";
export LD_LIBRARY_PATH
-for i in xpce/src chr clib clpqr cpp cppproxy db http inclpr jpl mp nlp odbc
pldoc plunit semweb sgml sgml/RDF ssl table uri zlib; do
+for i in xpce/src chr clib clpqr cpp cppproxy db http inclpr %{?with_java:jpl}
mp nlp odbc pldoc plunit semweb sgml sgml/RDF ssl table uri zlib; do
PATH=$RPM_BUILD_ROOT%{_bindir}:$PATH \
%{__make} -j1 install -C packages/$i \
PLBASE=$RPM_BUILD_ROOT%{_libdir}/pl-%{version} \
@@ -130,13 +139,9 @@
mandir=$RPM_BUILD_ROOT%{_mandir}/man1
done
-# why are manpages installed twice?
-#rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
-
-#mv -f $RPM_BUILD_ROOT%{_mandir}/man3/readline.{3,3pl}
-
%clean
rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(644,root,root,755)
%doc README* LSM ChangeLog PORTING
@@ -145,14 +150,16 @@
%dir %{_libdir}/pl-%{version}
%attr(755,root,root) %{_libdir}/pl-%{version}/bin
%{_libdir}/pl-%{version}/boot*
-%{_libdir}/pl-%{version}/lib*
+%dir %{_libdir}/pl-%{version}/lib
+%{?with_java:%{_libdir}/pl-%{version}/lib/jpl.jar}
+%dir %{_libdir}/pl-%{version}/lib/*-linux
+%attr(755,root,root) %{_libdir}/pl-%{version}/lib/*-linux/*.so*
%{_libdir}/pl-%{version}/include
%{_libdir}/pl-%{version}/do*
%{_libdir}/pl-%{version}/swipl
%{_libdir}/pl-%{version}/*.rc
%{_pkgconfigdir}/pl.pc
%{_mandir}/man?/pl*
-#%{_mandir}/man?/readline*
%files -n xpce
%defattr(644,root,root,755)
@@ -166,7 +173,6 @@
%{_libdir}/%{name}-%{version}/xpce-%{xpce_version}/man
%{_libdir}/%{name}-%{version}/xpce-%{xpce_version}/pl
%{_libdir}/%{name}-%{version}/xpce-%{xpce_version}/prolog
-#%{_mandir}/man?/xpce*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -174,6 +180,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2009/03/11 10:46:23 baggins
+- BR java-sun
+- added java bcond
+- don't build java bindings on archs not supported by java-sun
+
Revision 1.73 2009/03/10 18:16:54 baggins
- 5.7.7
- go with development branch, at least it's 64 bit safe
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pl.spec?r1=1.73&r2=1.74&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
