- fix format string error

- cleanup files
- rel 10

diff --git a/bogl.spec b/bogl.spec
index 1c7c287022ca1337e11e61e5760bf2af6de238ac..25063e72967666476a6e4039163064438a489fa1 100644 (file)
--- 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:       9
+Release:       10
 Epoch:         0
 License:       GPL
 Group:         Libraries
@@ -25,6 +25,7 @@ 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
@@ -89,6 +90,7 @@ konsoli.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 mkdir -p fonts
 cd fonts
@@ -132,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)
@@ -153,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

diff --git a/format-security.patch b/format-security.patch
new file mode 100644 (file)
index 0000000..ceb72e0
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- bogl/reduce-font.c.orig    2013-07-14 19:51:19.125683835 +0200
++++ bogl/reduce-font.c 2013-07-14 19:51:32.319146874 +0200
+@@ -146,7 +146,7 @@
+                     else if (strncmp (buf, "STARTCHAR ", 10) == 0)
+                         header = 0;
+                     else
+-                        fprintf (stdout, buf);
++                        fprintf (stdout, "%s", buf);
+                 }
+                 
+                 if (!header)