From 0ab977a5781fd07969920d83e2041bba4c3fbac3 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Aug 22 2011 16:03:47 +0000 Subject: Improve spec coments and text --- diff --git a/.gitignore b/.gitignore index 6f44a1c..0533b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ SWI-Prolog-5.7.11.pdf /pl-5.10.2.tar.gz /SWI-Prolog-5.10.2.pdf /userguide.html.tgz +/pl-5.10.5.tar.gz +/SWI-Prolog-5.10.5.pdf diff --git a/pl.spec b/pl.spec index 113d94d..8e4b35f 100644 --- a/pl.spec +++ b/pl.spec @@ -61,7 +61,7 @@ BuildRequires: java-%{jdkvershort}-devel = 1:%{jdkverlong} # zlib BuildRequires: zlib-devel # helpers for export_dynamic patch -BuildRequires: autoconf +BuildRequires: autoconf %description ISO/Edinburgh-style Prolog compiler including modules, auto-load, @@ -119,10 +119,10 @@ Requires: java Requires: jpackage-utils %description jpl -JPL is a library using the SWI-Prolog foreign interface and the Java jni -interface providing a bidirectional interface between Java and Prolog +JPL is a library using the SWI-Prolog foreign interface and the Java Native +Interface providing a bidirectional interface between Java and Prolog that can be used to embed Prolog in Java as well as for embedding Java -in Prolog. In both setups it provides a reentrant bidirectional interface. +in Prolog. In both setups it provides a re-entrant bidirectional interface. %endif @@ -216,10 +216,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/lib/jpl.jar \ 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 +#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 +#rm -rf $RPM_BUILD_ROOT%%{_libdir}/swipl-%%{version}/xpce-*/include %endif # Move the binaries into %%{_bindir} directly instead of using links @@ -260,7 +260,7 @@ rm -rf $RPM_BUILD_ROOT # Devel %exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.so %exclude %{_libdir}/swipl-%{version}/include -#%exclude %{_libdir}/swipl-%{version}/xpce-*/include +#%%exclude %%{_libdir}/swipl-%%{version}/xpce-*/include # Static %exclude %{_libdir}/swipl-%{version}/lib/*/libswipl.a %if %{separate_xpce} @@ -287,7 +287,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_libdir}/swipl-%{version}/include -#%{_libdir}/swipl-%{version}/xpce-*/include +#%%{_libdir}/swipl-%%{version}/xpce-*/include %{_libdir}/swipl-%{version}/lib/*/libswipl.so %{_libdir}/pkgconfig/swipl.pc diff --git a/sources b/sources index e46f921..cdd9384 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ a4462019611caa4f69247c8bf94404a7 userguide.html.tgz -7a223c66d606b10a06a277150f5f5fde SWI-Prolog-5.10.2.pdf -7973bcfd3854ae0cb647cc62f2faabcf pl-5.10.2.tar.gz +1ca45eddd3590fb525085761e75a4ebd pl-5.10.5.tar.gz +2a0898b96c3fd5c8de334c1811b81431 SWI-Prolog-5.10.5.pdf