X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bogl.spec;h=583139f332918843dcd299f759e41e03d0f524aa;hb=refs%2Fheads%2Fmaster;hp=8742396af8457342a849edddabb9f26d356761c5;hpb=5cb893c68956540199d300d60b4ce2347486ae0f;p=packages%2Fbogl.git

diff --git a/bogl.spec b/bogl.spec
index 8742396..583139f 100644
--- a/bogl.spec
+++ b/bogl.spec
@@ -4,7 +4,7 @@ Summary:	A terminal program for displaying Unicode on the console
 Summary(pl.UTF-8):	Program terminalowy do wyświetlania Unikodu na konsoli
 Name:		bogl
 Version:	0.1.18
-Release:	3
+Release:	11
 Epoch:		0
 License:	GPL
 Group:		Libraries
@@ -23,6 +23,9 @@ Patch1:		%{name}-0.1.9-fpic.patch
 Patch3:		%{name}-0.1.9-2.6fbdev.patch
 Patch4:		%{name}-0.1.18-gcc.patch
 Patch5:		%{name}-0.1.18-noexecstack.patch
+Patch6:		%{name}-page_mask.patch
+Patch7:		%{name}-shared.patch
+Patch8:		format-security.patch
 URL:		http://www.stanford.edu/~blp/projects.html
 BuildRequires:	gd-devel
 BuildRequires:	libpng-devel
@@ -85,6 +88,9 @@ konsoli.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 mkdir -p fonts
 cd fonts
@@ -92,8 +98,8 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE3}
 
 %build
-%{__make} \
-	CFLAGS="%{rpmcflags}"
+%{__make} -j1 \
+	CFLAGS="%{rpmcflags} -fPIC"
 #./mergebdf fonts/9x18.bdf fonts/18x18ja.bdf > font.bdf
 gunzip -c %{SOURCE4} > font.bdf
 ./bdftobogl -b font.bdf > font.bgf
@@ -128,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_libdir}/libbogl.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libbogl.so.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -149,7 +156,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.BOGL-bterm
 %attr(755,root,root) %{_bindir}/bterm
-# XXX: dir duplicated with terminfo package
-%dir %{_datadir}/terminfo/b
 %{_datadir}/terminfo/b/bterm
 %{_libdir}/bogl