SPECS: iterm.spec - added two patches for fbiterm - added bcond_wi...

[witekfl]

Author: witekfl                      Date: Mon Sep 10 16:25:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added two patches for fbiterm
- added bcond_without static_libs
- Rel 6

---- Files affected:
SPECS:
   iterm.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/iterm.spec
diff -u SPECS/iterm.spec:1.13 SPECS/iterm.spec:1.14
--- SPECS/iterm.spec:1.13	Tue Feb 13 09:06:35 2007
+++ SPECS/iterm.spec	Mon Sep 10 18:25:32 2007
@@ -1,10 +1,13 @@
 # $Revision$, $Date$
-# TODO: xorg reqs
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+#
 Summary:	Internationalized Terminal Emulator Framework
 Summary(pl.UTF-8):	Szkielet dla umiędzynarodowionego emulatora terminala
 Name:		iterm
 Version:	0.5
-Release:	5
+Release:	6
 License:	Common Public License v0.5
 Group:		Applications
 Source0:	http://www.doc.ic.ac.uk/~mbt99/Y/src/%{name}-%{version}-mbt.tar.gz
@@ -17,6 +20,8 @@
 Patch3:		%{name}-terminfo.patch
 Patch4:		%{name}-fb-direct.patch
 Patch5:		%{name}-gcc4.patch
+Patch6:		%{name}-fb-bold_font.patch
+Patch7:		%{name}-fb-direct16.patch
 URL:		http://www-124.ibm.com/linux/projects/iterm/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -189,6 +194,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 # libiterm
@@ -202,7 +209,8 @@
 %configure \
 	--disable-pls \
 	--enable-fribidi \
-	--with-utempter
+	--with-utempter \
+	%{!?with_static_libs:--disable-static}
 %{__make}
 
 # libXiterm
@@ -212,7 +220,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{!?with_static_libs:--disable-static}
 %{__make}
 
 # Xiterm
@@ -300,9 +309,11 @@
 %{_libdir}/libiterm.la
 %{_includedir}/iterm
 
+%if %{with static_libs}
 %files -n libiterm-static
 %defattr(644,root,root,755)
 %{_libdir}/libiterm.a
+%endif
 
 %files -n libXiterm
 %defattr(644,root,root,755)
@@ -317,9 +328,11 @@
 %{_libdir}/libXiterm.la
 %{_includedir}/Iterm*.h
 
+%if %{with static_libs}
 %files -n libXiterm-static
 %defattr(644,root,root,755)
 %{_libdir}/libXiterm.a
+%endif
 
 %files Xaw
 %defattr(644,root,root,755)
@@ -348,6 +361,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/09/10 16:25:32  witekfl
+- added two patches for fbiterm
+- added bcond_without static_libs
+- Rel 6
+
 Revision 1.13  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iterm.spec?r1=1.13&r2=1.14&f=u