packages: pl/pl-clib-configure.patch, pl/pl.spec, pl/pl-xpce-install.patch ...

Sat Mar 17 21:45:06 CET 2012

Author: qboosh                       Date: Sat Mar 17 20:45:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 6.0.2
- updated clib-configure patch, added xpce-install patch

---- Files affected:
packages/pl:
   pl-clib-configure.patch (1.1 -> 1.2) , pl.spec (1.85 -> 1.86) , pl-xpce-install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pl/pl-clib-configure.patch
diff -u packages/pl/pl-clib-configure.patch:1.1 packages/pl/pl-clib-configure.patch:1.2

--- packages/pl/pl-clib-configure.patch:1.1	Tue Mar 10 22:24:20 2009
+++ packages/pl/pl-clib-configure.patch	Sat Mar 17 21:45:01 2012
@@ -1,13 +1,13 @@
---- pl-5.7.7/packages/clib/configure.in~	2009-02-26 15:19:36.000000000 +0100
-+++ pl-5.7.7/packages/clib/configure.in	2009-03-10 18:20:37.000000000 +0100
-@@ -120,8 +120,8 @@
+--- pl-6.0.2/packages/clib/configure.in.orig	2012-02-19 18:50:57.000000000 +0100
++++ pl-6.0.2/packages/clib/configure.in	2012-03-16 17:19:54.898098597 +0100
+@@ -66,8 +66,8 @@
  ( CC=$ACC; LD=$ALD; CPP=$ACPP; CFLAGS=$CFLAGS; LDFLAGS=$LDFLAGS;
    export CC LD CFLAGS LDFLAGS
  
--  (cd maildrop/rfc822 && $SHELL configure)
--  (cd maildrop/rfc2045 && $SHELL configure)
-+  (cd maildrop/rfc822 && $SHELL ./configure)
-+  (cd maildrop/rfc2045 && $SHELL ./configure)
+-  (cd maildrop/rfc822 && $SHELL configure --host=$host)
+-  (cd maildrop/rfc2045 && $SHELL configure --host=$host)
++  (cd maildrop/rfc822 && $SHELL ./configure --host=$host)
++  (cd maildrop/rfc2045 && $SHELL ./configure --host=$host)
  )
  AC_MSG_RESULT("Done")
  

================================================================
Index: packages/pl/pl.spec
diff -u packages/pl/pl.spec:1.85 packages/pl/pl.spec:1.86
--- packages/pl/pl.spec:1.85	Fri Jan 13 22:00:46 2012
+++ packages/pl/pl.spec	Sat Mar 17 21:45:01 2012
@@ -11,17 +11,18 @@
 %undefine	with_java
 %endif
 
-%define		xpce_version 6.6.66
 Summary:	SWI Prolog Language
 Summary(pl.UTF-8):	Język SWI Prolog
 Name:		pl
-Version:	5.10.4
-Release:	3
-License:	LGPL/GPL
+Version:	6.0.2
+Release:	1
+License:	LGPL v2.1+
 Group:		Development/Languages
+#Source0Download: http://www.swi-prolog.org/download/stable
 Source0:	http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
-# Source0-md5:	363433bb2f80a6c2befeaee7768197b4
+# Source0-md5:	dcde1c50713317d0f5093dd2dedc1bd0
 Patch0:		%{name}-clib-configure.patch
+Patch1:		%{name}-xpce-install.patch
 URL:		http://www.swi-prolog.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -76,22 +77,23 @@
 Requires:	java-sun
 
 %description jpl
-JPL 3.x is a dynamic, bidirectional interface between SWI-Prolog 5.2.0 or
-later and Java 2 runtimes (see JPL 3.x Objectives). It offers two APIs:
-  * Java API (Java-calls-Prolog): this interface comprises public Java
-    classes which support:
-       + constructing Java representations of Prolog terms and queries
-       + calling queries within SWI-Prolog engines
-       + retrieving (as Java representations of Prolog terms) any bindings
-         created by a call
-  * Prolog API (Prolog-calls-Java): this interface comprises Prolog library
-    predicates which support:
-       + creating instances (objects) of Java classes (built-in and
-         user-defined)
-       + calling methods of Java objects (and static methods of classes),
-         perhaps returning values or object references
-       + getting and setting the values of fields of Java objects and
-         classes
+JPL 3.x is a dynamic, bidirectional interface between SWI-Prolog 5.2.0
+or later and Java 2 runtimes (see JPL 3.x Objectives). It offers two
+APIs:
+ * Java API (Java-calls-Prolog): this interface comprises public Java
+   classes which support:
+    + constructing Java representations of Prolog terms and queries
+    + calling queries within SWI-Prolog engines
+    + retrieving (as Java representations of Prolog terms) any
+      bindings created by a call
+ * Prolog API (Prolog-calls-Java): this interface comprises Prolog
+   library predicates which support:
+    + creating instances (objects) of Java classes (built-in and
+      user-defined)
+    + calling methods of Java objects (and static methods of classes),
+      perhaps returning values or object references
+    + getting and setting the values of fields of Java objects and
+      classes
 
 Calls to the two APIs can be nested, e.g. Java code can call Prolog
 predicates which call Java methods which call Prolog predicates etc.
@@ -100,19 +102,19 @@
 JPL 3.x to dynamiczny, dwukierunkowy interfejs pomiędzy SWI-Prologiem
 5.2.0 i późniejszymi a środowiskami uruchomieniowymi Javy 2 (więcej w
 dokumencie JPL 3.x Objectives). Oferuje dwa API:
-  - API Javy (wywołania Prologu z Javy) - ten interfejs obejmuje klasy
-    publiczne Javy obsługujące:
-    - tworzenie reprezentacji wyrażeń i zapytań Prologu w Javie
-    - wywoływanie zapytań wewnątrz silników SWI-Prologu
-    - odtwarzanie (jako reprezentacji wyrażeń Prologu w Javie)
-      wszelkich dowiązań utworzonych przez wywołanie
-  - API Prologu (wywołania Javy z Prologu) - ten interfejs obejmuje
-    predykaty biblioteki Prologu obsługującą:
-    - tworzenie instancji (obiektów) klas Javy (wbudowanych i
-      zdefiniowanych przez użytkownika)
-    - wywołania metod obiektów (i statycznych metod klas) Javy, także
-      zwracających wartości lub referencje do obiektów
-    - pobieranie i ustawianie wartości pól obiektów i klas Javy
+ - API Javy (wywołania Prologu z Javy) - ten interfejs obejmuje klasy
+   publiczne Javy obsługujące:
+   - tworzenie reprezentacji wyrażeń i zapytań Prologu w Javie
+   - wywoływanie zapytań wewnątrz silników SWI-Prologu
+   - odtwarzanie (jako reprezentacji wyrażeń Prologu w Javie)
+     wszelkich dowiązań utworzonych przez wywołanie
+ - API Prologu (wywołania Javy z Prologu) - ten interfejs obejmuje
+   predykaty biblioteki Prologu obsługującą:
+   - tworzenie instancji (obiektów) klas Javy (wbudowanych i
+     zdefiniowanych przez użytkownika)
+   - wywołania metod obiektów (i statycznych metod klas) Javy, także
+     zwracających wartości lub referencje do obiektów
+   - pobieranie i ustawianie wartości pól obiektów i klas Javy
 
 Wywołania obu API mogą być zagnieżdżane, np. kod w Javie może wywołać
 predykaty Prologu wywołujące metody Javy, które wywołują predykaty
@@ -141,6 +143,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd src
@@ -158,15 +161,16 @@
 
 cd packages
 wd=`pwd`
+# see packages/configure for default packages list and their order
 for i in clib cpp odbc table xpce/src sgml RDF semweb http chr \
 		clpqr nlp ssl tipc pldoc plunit %{?with_java:jpl} \
-		zlib R protobufs \
+		zlib R protobufs PDT utf8proc \
 		inclpr ; do
 	cd $i
 	cp -f /usr/share/automake/config.sub .
 	%{__aclocal}
 	%{__autoconf}
-	%{__autoheader} || :
+	grep -q AC_CONFIG_HEADER configure.in && %{__autoheader}
 	%configure
 	%{__make}
 	cd $wd
@@ -193,15 +197,20 @@
 		mandir=$RPM_BUILD_ROOT%{_mandir}/man1
 done
 
+# packaged as doc
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/{customize,xpce/{COPYING,README}}
+# no need to package
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/swipl-%{version}/demo
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README* ReleaseNotes/*
-%doc dotfiles/dot*
+%doc README ReleaseNotes/relnotes-* customize
 %attr(755,root,root) %{_bindir}/swipl*
 %dir %{_libdir}/swipl-%{version}
+%{_libdir}/swipl-%{version}/Makefile
 %attr(755,root,root) %{_libdir}/swipl-%{version}/bin
 %{_libdir}/swipl-%{version}/boot*
 %dir %{_libdir}/swipl-%{version}/lib
@@ -218,26 +227,26 @@
 %{_libdir}/swipl-%{version}/*.rc
 %{_libdir}/swipl-%{version}/swipl.home
 %{_pkgconfigdir}/swipl.pc
-%{_mandir}/man?/swipl*
+%{_mandir}/man1/swipl*.1*
 
 %files xpce
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xpce*
-%dir %{_libdir}/swipl-%{version}/xpce-%{xpce_version}
-%{_libdir}/swipl-%{version}/xpce
-%attr(755,root,root) %{_libdir}/swipl-%{version}/xpce-%{xpce_version}/bin
-%attr(755,root,root) %{_libdir}/swipl-%{version}/xpce-%{xpce_version}/lib
-%{_libdir}/swipl-%{version}/xpce-%{xpce_version}/appl-help
-%{_libdir}/swipl-%{version}/xpce-%{xpce_version}/bitmaps
-%{_libdir}/swipl-%{version}/xpce-%{xpce_version}/man
-%{_libdir}/swipl-%{version}/xpce-%{xpce_version}/pl
-%{_libdir}/swipl-%{version}/xpce-%{xpce_version}/prolog
+%doc packages/xpce/{EXTENDING,INFO,README,README-4.8,README.CXX,README.alpha,README.customise}
+%attr(755,root,root) %{_bindir}/xpce-client
+%dir %{_libdir}/swipl-%{version}/xpce
+%{_libdir}/swipl-%{version}/xpce/Defaults*
+%attr(755,root,root) %{_libdir}/swipl-%{version}/xpce/bin
+%{_libdir}/swipl-%{version}/xpce/appl-help
+%{_libdir}/swipl-%{version}/xpce/bitmaps
+%{_libdir}/swipl-%{version}/xpce/man
+%{_libdir}/swipl-%{version}/xpce/pl
+%{_libdir}/swipl-%{version}/xpce/prolog
 
 %if %{with java}
 %files jpl
 %defattr(644,root,root,755)
-%{_libdir}/swipl-%{version}/lib/jpl.jar
 %attr(755,root,root) %{_libdir}/swipl-%{version}/lib/*-linux/libjpl.so
+%{_libdir}/swipl-%{version}/lib/jpl.jar
 %{_libdir}/swipl-%{version}/library/jpl.pl
 %endif
 
@@ -247,6 +256,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2012/03/17 20:45:01  qboosh
+- updated to 6.0.2
+- updated clib-configure patch, added xpce-install patch
+
 Revision 1.85  2012/01/13 21:00:46  arekm
 - release 3
 

================================================================
Index: packages/pl/pl-xpce-install.patch
diff -u /dev/null packages/pl/pl-xpce-install.patch:1.1
--- /dev/null	Sat Mar 17 21:45:07 2012
+++ packages/pl/pl-xpce-install.patch	Sat Mar 17 21:45:01 2012
@@ -0,0 +1,11 @@
+--- pl-6.0.2/packages/xpce/src/Makefile.in.orig	2012-02-09 16:01:49.000000000 +0100
++++ pl-6.0.2/packages/xpce/src/Makefile.in	2012-03-17 09:46:12.973414463 +0100
+@@ -708,7 +708,7 @@
+ 		    fi; \
+ 		    echo done; \
+ 		done
+-		$(PL) -C "$(DESTDIR)$(DVHOME)" -f none -t 'halt(1)' \
++		./xpce.sh -C "$(DESTDIR)$(DVHOME)" -f none -t 'halt(1)' \
+ 			-g "make_library_index('prolog/lib'),halt"
+ 		$(INSTALL_DATA) ../prolog/lib/Overview $(DESTDIR)$(DVHOME)/prolog/lib
+ 		$(INSTALL_DATA) ../prolog/lib/trace/pltracer.hlp $(DESTDIR)$(DVHOME)/prolog/lib/trace
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pl/pl-clib-configure.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pl/pl.spec?r1=1.85&r2=1.86&f=u

