diff --git a/sword-gcc43.patch b/sword-gcc43.patch new file mode 100644 index 0000000..4bf88c2 --- /dev/null +++ b/sword-gcc43.patch @@ -0,0 +1,10 @@ +--- src/modules/filters/gbfwordjs.cpp 2006-11-25 16:29:46.000000000 -0500 ++++ src/modules/filters/gbfwordjs.cpp.new 2008-01-10 13:11:20.000000000 -0500 +@@ -6,6 +6,7 @@ + + + #include ++#include + #include + #include + #include diff --git a/sword-open.patch b/sword-open.patch deleted file mode 100644 index 6ea69e9..0000000 --- a/sword-open.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- utilities/cipherraw.cpp 2005-05-02 23:49:04.000000000 -0400 -+++ utilities/cipherraw.cpp.new 2007-09-25 18:14:16.000000000 -0400 -@@ -45,13 +45,13 @@ - - tmpbuf = new char [ strlen(argv[1]) + 11 ]; - sprintf(tmpbuf, "%sot.zzz", argv[1]); -- ofd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT); -+ ofd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600); - sprintf(tmpbuf, "%sot.zzz.vss", argv[1]); -- oxfd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT); -+ oxfd[0] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600); - sprintf(tmpbuf, "%snt.zzz", argv[1]); -- ofd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT); -+ ofd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600); - sprintf(tmpbuf, "%snt.zzz.vss", argv[1]); -- oxfd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT); -+ oxfd[1] = open(tmpbuf, O_WRONLY|O_BINARY|O_CREAT, 0600); - - delete [] tmpbuf; - ---- utilities/gbfidx.cpp 2007-09-25 18:12:44.000000000 -0400 -+++ utilities/gbfidx.cpp.new 2007-09-25 18:13:04.000000000 -0400 -@@ -258,25 +258,25 @@ - #endif // don't need it. - char buf[255]; - -- if ((fp = open(fname, O_RDONLY|O_BINARY)) == -1) { -+ if ((fp = open(fname, O_RDONLY|O_BINARY, 0600)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", fname); - exit(1); - } - - sprintf(buf, "%s.vss", fname); -- if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) { -+ if ((vfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - sprintf(buf, "%s.cps", fname); -- if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) { -+ if ((cfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } - - sprintf(buf, "%s.bks", fname); -- if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY)) == -1) { -+ if ((bfp = open(buf, O_CREAT|O_WRONLY|O_BINARY, 0600)) == -1) { - fprintf(stderr, "Couldn't open file: %s\n", buf); - exit(1); - } diff --git a/sword.spec b/sword.spec index 06340f6..29c692c 100644 --- a/sword.spec +++ b/sword.spec @@ -1,14 +1,14 @@ Name: sword Version: 1.5.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free Bible Software Project Group: System Environment/Libraries License: GPLv2 URL: http://www.crosswire.org/sword/ Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-%{version}.tar.gz +Patch0: sword-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: openssl-devel BuildRequires: curl-devel BuildRequires: zlib-devel @@ -40,6 +40,7 @@ that uses the sword API, such as Gnomesword or Bibletime. %prep %setup -q +%patch0 -p0 -b .gcc43 %build %configure --disable-static --with-icu --with-lucene @@ -82,6 +83,9 @@ rm -rf %buildroot %changelog +* Thu Jan 10 2008 Deji Akingunola - 1.5.10-2 +- Fix build issue with gcc43 + * Mon Nov 05 2007 Deji Akingunola - 1.5.10-1 - Update to version 1.5.10