- added format patch (for -Werror=format-security errors)

diff --git a/Canna-format.patch b/Canna-format.patch
new file mode 100644 (file)
index 0000000..c2946c5
--- /dev/null
+++ b/Canna-format.patch
@@ -0,0 +1,34 @@
+--- Canna37p3/cmd/catdic/can.c.orig    2003-02-01 20:34:20.000000000 +0100
++++ Canna37p3/cmd/catdic/can.c 2012-11-13 19:44:35.098812750 +0100
+@@ -1236,7 +1236,7 @@
+       break;
+       default:
+       if (init[0] == '/') {
+-          (void)fprintf(stderr,msg_abnl);
++          (void)fputs(msg_abnl,stderr);
+       } else {
+           (void)fprintf(stderr,msg_abnls,init);
+       }
+@@ -1297,11 +1297,11 @@
+ 
+     if ( opt_fq ) {
+       if ( opt_s ) {
+-        (void) fprintf(stderr,msg_sfq);
++        (void) fputs(msg_sfq,stderr);
+         exit(ERR_VALUE) ;
+       }  
+       if ( opt_l || opt_std ) {
+-        (void) fprintf(stderr,msg_l);
++        (void) fputs(msg_l,stderr);
+         exit(ERR_VALUE) ;
+       }
+       mode = mode | PL_DIC ;
+@@ -1491,7 +1491,7 @@
+     break;
+   default:
+     if(init[0] == '/') {
+-      fprintf(stderr,msg_abnl );
++      fputs(msg_abnl,stderr);
+     }
+     else {
+       fprintf(stderr,msg_abnls,init);

diff --git a/Canna.spec b/Canna.spec
index a13810554f90291e9cc6de1ba32db7120b439feb..0685871d11d6885a4b4c24b0a339fec384702f8b 100644 (file)
--- a/Canna.spec
+++ b/Canna.spec
@@ -13,7 +13,8 @@ Source0:      http://downloads.sourceforge.jp/canna/9565/%{name}%{dver}.tar.bz2
 Source1:       %{name}.init
 Source2:       %{name}-dot-canna
 Patch0:                %{name}-conf.patch
 Source1:       %{name}.init
 Source2:       %{name}-dot-canna
 Patch0:                %{name}-conf.patch

-Patch1:                %{name}-lib64.patch
+Patch1:                %{name}-format.patch
+Patch2:                %{name}-lib64.patch

 URL:           http://canna.sourceforge.jp/
 BuildRequires: cpp
 BuildRequires: rpmbuild(macros) >= 1.268
 URL:           http://canna.sourceforge.jp/
 BuildRequires: cpp
 BuildRequires: rpmbuild(macros) >= 1.268


@@ -106,8 +107,9 @@ Ten pakiet zawiera statyczne biblioteki Canna.
 %prep
 %setup -q -n %{name}%{dver}
 %patch0 -p1
 %prep
 %setup -q -n %{name}%{dver}
 %patch0 -p1

-%if "%{_lib}" == "lib64"

 %patch1 -p1
 %patch1 -p1

+%if "%{_lib}" == "lib64"
+%patch2 -p1

 %endif
 
 %build
 %endif
 
 %build