SPECS: pl.spec - attempt at modular xorg BRs - updated install and files

[baggins]

Author: baggins                      Date: Mon Feb 16 14:30:41 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- attempt at modular xorg BRs
- updated install and files

---- Files affected:
SPECS:
   pl.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/pl.spec
diff -u SPECS/pl.spec:1.68 SPECS/pl.spec:1.69
--- SPECS/pl.spec:1.68	Mon Feb 16 12:33:35 2009
+++ SPECS/pl.spec	Mon Feb 16 15:30:35 2009
@@ -3,7 +3,7 @@
 # TODO
 # - package jpl
 # - maybe separate packages to miscelious packages?
-%define		xpce_version 6.6.50
+%define		xpce_version 6.6.64
 Summary:	SWI Prolog Language
 Summary(pl.UTF-8):	Język SWI Prolog
 Name:		pl
@@ -14,7 +14,6 @@
 Source0:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/%{name}-%{version}.tar.gz
 # Source0-md5:	2f06f64007fdac076a277ee4a8c53274
 URL:		http://www.swi-prolog.org/
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	fontconfig-devel
@@ -23,6 +22,21 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	unixODBC-devel
+BuildRequires:	gmp-devel
+BuildRequires:	openssl-devel
+BuildRequires:	pkgconfig
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libXrender-devel
+BuildRequires:	xorg-lib-libXt-devel
+BuildRequires:	jdk
 Obsoletes:	swi-pl
 Obsoletes:	swi-prolog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,13 +106,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_prefix}
 
 %{__make} install -C src \
-	PLBASE=$RPM_BUILD_ROOT%{_libdir}/pl-%{version} \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	bindir=$RPM_BUILD_ROOT%{_bindir} \
-	mandir=$RPM_BUILD_ROOT%{_mandir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/doc
 
@@ -118,7 +128,6 @@
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %doc README* LSM ChangeLog PORTING
@@ -132,6 +141,7 @@
 %{_libdir}/pl-%{version}/do*
 %{_libdir}/pl-%{version}/swipl
 %{_libdir}/pl-%{version}/*.rc
+%{_pkgconfigdir}/pl.pc
 %{_mandir}/man?/pl*
 #%{_mandir}/man?/readline*
 
@@ -154,6 +164,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2009/02/16 14:30:35  baggins
+- attempt at modular xorg BRs
+- updated install and files
+
 Revision 1.68  2009/02/16 11:33:35  baggins
 - 5.6.64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pl.spec?r1=1.68&r2=1.69&f=u