diff --git a/guile-64bit.patch b/guile-64bit.patch deleted file mode 100644 index af1b465..0000000 --- a/guile-64bit.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: libguile/hash.c -=================================================================== ---- libguile/hash.c.orig 2016-07-21 14:25:17.522695394 +0200 -+++ libguile/hash.c 2016-07-21 14:25:22.778646713 +0200 -@@ -296,7 +296,7 @@ - unsigned long - scm_ihashq (SCM obj, unsigned long n) - { -- return (SCM_UNPACK (obj) >> 1) % n; -+ return ((unsigned long) SCM_UNPACK (obj) >> 1) % n; - } - - -@@ -332,7 +332,7 @@ - if (SCM_NUMP(obj)) - return (unsigned long) scm_hasher(obj, n, 10); - else -- return SCM_UNPACK (obj) % n; -+ return (unsigned long) SCM_UNPACK (obj) % n; - } - - -Index: libguile/struct.c -=================================================================== ---- libguile/struct.c.orig 2016-07-21 14:25:17.522695394 +0200 -+++ libguile/struct.c 2016-07-21 14:25:22.778646713 +0200 -@@ -918,7 +918,7 @@ - { - /* The length of the hash table should be a relative prime it's not - necessary to shift down the address. */ -- return SCM_UNPACK (obj) % n; -+ return (unsigned long) SCM_UNPACK (obj) % n; - } - - /* Return the hash of struct OBJ, modulo N. Traverse OBJ's fields to diff --git a/guile.changes b/guile.changes index 98c2641..ef6f8df 100644 --- a/guile.changes +++ b/guile.changes @@ -5,8 +5,8 @@ Fri Mar 31 12:49:55 UTC 2017 - psimons@suse.com * guile-64bit.patch no longer applies. I haven't forward-ported it to the new version because it's not obvious to me whether - this patch is still required in the new code base, which quite - different [boo#1032881]. + this patch is still required in the new code base, which is + quite different [boo#1032881]. * libguilereadline.so no longer exists. diff --git a/guile.spec b/guile.spec index 5aa901f..7db7f32 100644 --- a/guile.spec +++ b/guile.spec @@ -34,10 +34,9 @@ Source1: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=guile&download=1#/%{name}.keyring Source3: guile-rpmlintrc # suse specific -Patch1: %{name}-64bit.patch -Patch2: %{name}-1.6.10-mktemp.patch -Patch3: %{name}-threads-test.patch -Patch4: %{name}-net-db-test.patch +Patch2: guile-1.6.10-mktemp.patch +Patch3: guile-threads-test.patch +Patch4: guile-net-db-test.patch BuildRequires: gc-devel BuildRequires: gmp-devel BuildRequires: libffi-devel @@ -101,7 +100,6 @@ linked in as a library when building extensible programs. %prep %setup -q -#%patch1 %patch2 %patch3 -p1 %patch4 -p1