Revert, graphviz (ring1) was merged in parallel, but asks newly for pkgconfig(guile-2.0)
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/guile?expand=0&rev=52
This commit is contained in:
parent
a32bf1688f
commit
40377ee526
@ -1,7 +0,0 @@
|
|||||||
<constraints>
|
|
||||||
<hardware>
|
|
||||||
<memory>
|
|
||||||
<size unit="G">2</size>
|
|
||||||
</memory>
|
|
||||||
</hardware>
|
|
||||||
</constraints>
|
|
3
guile-2.0.14.tar.xz
Normal file
3
guile-2.0.14.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82
|
||||||
|
size 4615196
|
17
guile-2.0.14.tar.xz.sig
Normal file
17
guile-2.0.14.tar.xz.sig
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQJBBAABCAArFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAliiLd4NHGx1ZG9AZ251
|
||||||
|
Lm9yZwAKCRAJCxGZPZrrtfFGD/9E6mQjedgPDHcmjyYtiapirAVDK3nnMht/rjqn
|
||||||
|
5JPt70MSX3XbYm1dW1UHXulCtUjNw4wBEtbTcIIuPe/ui7tbVrzk/sVuveCCH5/w
|
||||||
|
qj3ynBT6o+2heNfnfPKcYBZG2XIIgnkvjf2mibztyt2SPiXJ+0LKQJWMcd26NyiB
|
||||||
|
zdye0jD5L26yrEktfrpZIJVWnrL4vmIw8ay98VhoSjoYckVghoZob3RRdb+gfvy0
|
||||||
|
d/0OxEe9i9I4viqsXT5zIU7dm0SLogS187N/OAYDqsVXMYc40iRG45fvzhi4IsUy
|
||||||
|
YbjS1xjD36mHQL86abtCV6l7qykWBV5/Xgqa5NS05Vp5HhMLdc2D9Cc08N+g1nAH
|
||||||
|
XovUSSDQtlld9wo2xxVetkp/3/3uElw9b9MAVvjcT3Zrgh4xNcJTJMHmuR8598Xb
|
||||||
|
hoUvdNyKfCILabFhuIhqzcCfhjjyy3AOvKE/9/Uy1eklrWqhsQCNHlBhbvfdKXjB
|
||||||
|
JSscxuMTVRILhY9ikQyntUlt0lsLNj2K/V3PF+BdqjMSSgBA8rvkMLYouwEJsr4J
|
||||||
|
JTUN+Dg/rCMTr3++ERB9dlxBARG9726RsPJM2E0IUQb54LvLXTkaGd+LHzJyDzY3
|
||||||
|
qVp1I3wvm7FeECy1s3ZIm9gjjMeH1BDETZb6iuRxxYAfiu3Nmqp/t53c5x1ID66C
|
||||||
|
4aq7Lw==
|
||||||
|
=vgBV
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c18198ff6e8b05c620dbdd49b816a2e63a2688af843b5cf8e965041f1adcb515
|
|
||||||
size 10847084
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEE/0ePsmTeMuwpZyWj3cD1NYgS+PIFAljJs0UACgkQ3cD1NYgS
|
|
||||||
+PLHWA/9HDdacbtCln+jY8Ikuf96SkIsY3f4JsBNpkeuKfbsyr+xyLEGvOgeEyDz
|
|
||||||
NTUhkzIBtFJA5wl/4htXX4n3ALMNNmoiYxtUWAtaBPI1ybInAUYb3bmtbJmzVFku
|
|
||||||
BZvm6m236X3vFK9J3NininBHCx5Gw4CYaQyt5ThrN3vjM1mQeujo2k4XkKUn+slY
|
|
||||||
NToaiUYVjD9l/Bn41q0U2teLjdp3SsMMU91sx+Ap0WRDmcvtmm8jl7FPxFHInJC+
|
|
||||||
G4WlqrTzeywAGm+gSU+S0xBDKIxvd3fTFpAb+vUGS8vhkPZxC/dlgW4KJkXA8nzp
|
|
||||||
7ovuQj2HIlt9h8L0QkEAF7tmHrWhFByZhj1NerkOnszswhI9ZNoDxrOzTS8GjXCX
|
|
||||||
ia2F2/6fC3WdFpwTln7hq0IgIhtOQ329fnSqmltO1/dx9rZznEPaDMtgEyd+uJ1B
|
|
||||||
4qN+TBHQYc8phd6HPDzPZnPhmDr+HWyo4Ymc9bSmi7kKTIIrFurB3/4LFiXudoFg
|
|
||||||
9sNd0Om8N83TAzRoB2A04MoFYTHodh8i8rsj/4NDNfZbTlp4liLq7tUXbgm5Pdze
|
|
||||||
H3P5Xonq08zpSwvLG4XM6Imq+WtJmXWp9s2H1/a+lFGpLzfk5jC2qyHHzkxkXc97
|
|
||||||
06oyVAlybZWMnqh+w7s18UcMoib9fxVBdynJm5SY+mem41FCbQg=
|
|
||||||
=YXgk
|
|
||||||
-----END PGP SIGNATURE-----
|
|
35
guile-64bit.patch
Normal file
35
guile-64bit.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
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
|
@ -1,15 +1,3 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Fri Mar 31 12:49:55 UTC 2017 - psimons@suse.com
|
|
||||||
|
|
||||||
- Update to version 2.2.0:
|
|
||||||
|
|
||||||
* 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 is
|
|
||||||
quite different [boo#1032881].
|
|
||||||
|
|
||||||
* libguilereadline.so no longer exists.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 17 12:45:52 UTC 2017 - mpluskal@suse.com
|
Fri Feb 17 12:45:52 UTC 2017 - mpluskal@suse.com
|
||||||
|
|
||||||
|
2911
guile.keyring
2911
guile.keyring
File diff suppressed because it is too large
Load Diff
36
guile.spec
36
guile.spec
@ -18,12 +18,14 @@
|
|||||||
|
|
||||||
# define the name used for versioning libs and directories.
|
# define the name used for versioning libs and directories.
|
||||||
%define guilemaj 2
|
%define guilemaj 2
|
||||||
%define guilemin 2
|
%define guilemin 0
|
||||||
%define guilevers %{guilemaj}.%{guilemin}
|
%define guilevers %{guilemaj}.%{guilemin}
|
||||||
%define libgver 1
|
%define libgver 22
|
||||||
%define gsuff %{guilemaj}_%{guilemin}-%{libgver}
|
%define gsuff %{guilemaj}_%{guilemin}-%{libgver}
|
||||||
|
%define libgreadver 18
|
||||||
|
%define greadsuff v-%{libgreadver}-%{libgreadver}
|
||||||
Name: guile
|
Name: guile
|
||||||
Version: %{guilevers}.0
|
Version: %{guilevers}.14
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
||||||
License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+
|
License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+
|
||||||
@ -34,9 +36,10 @@ 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
|
Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=guile&download=1#/%{name}.keyring
|
||||||
Source3: guile-rpmlintrc
|
Source3: guile-rpmlintrc
|
||||||
# suse specific
|
# suse specific
|
||||||
Patch2: guile-1.6.10-mktemp.patch
|
Patch1: %{name}-64bit.patch
|
||||||
Patch3: guile-threads-test.patch
|
Patch2: %{name}-1.6.10-mktemp.patch
|
||||||
Patch4: guile-net-db-test.patch
|
Patch3: %{name}-threads-test.patch
|
||||||
|
Patch4: %{name}-net-db-test.patch
|
||||||
BuildRequires: gc-devel
|
BuildRequires: gc-devel
|
||||||
BuildRequires: gmp-devel
|
BuildRequires: gmp-devel
|
||||||
BuildRequires: libffi-devel
|
BuildRequires: libffi-devel
|
||||||
@ -77,6 +80,17 @@ C. Guile provides a machine independent execution platform that can be
|
|||||||
linked in as a library when building extensible programs. This package
|
linked in as a library when building extensible programs. This package
|
||||||
contains guile modules.
|
contains guile modules.
|
||||||
|
|
||||||
|
%package -n libguilereadline-%{greadsuff}
|
||||||
|
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
||||||
|
License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+
|
||||||
|
Group: Development/Languages/Scheme
|
||||||
|
|
||||||
|
%description -n libguilereadline-%{greadsuff}
|
||||||
|
This is Guile, a portable, embeddable Scheme implementation written in
|
||||||
|
C. Guile provides a machine independent execution platform that can be
|
||||||
|
linked in as a library when building extensible programs. This package
|
||||||
|
contains the shared libraries.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
Summary: GNU's Ubiquitous Intelligent Language for Extension
|
||||||
License: LGPL-2.1+
|
License: LGPL-2.1+
|
||||||
@ -87,6 +101,7 @@ Requires: gmp-devel
|
|||||||
Requires: guile = %{version}
|
Requires: guile = %{version}
|
||||||
Requires: libffi-devel
|
Requires: libffi-devel
|
||||||
Requires: libguile-%{gsuff} = %{version}
|
Requires: libguile-%{gsuff} = %{version}
|
||||||
|
Requires: libguilereadline-%{greadsuff} = %{version}
|
||||||
Requires: libunistring-devel
|
Requires: libunistring-devel
|
||||||
Requires: ncurses-devel
|
Requires: ncurses-devel
|
||||||
Requires: readline-devel
|
Requires: readline-devel
|
||||||
@ -100,6 +115,7 @@ linked in as a library when building extensible programs.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
@ -140,6 +156,8 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
|
|||||||
|
|
||||||
%post -n libguile-%{gsuff} -p /sbin/ldconfig
|
%post -n libguile-%{gsuff} -p /sbin/ldconfig
|
||||||
%postun -n libguile-%{gsuff} -p /sbin/ldconfig
|
%postun -n libguile-%{gsuff} -p /sbin/ldconfig
|
||||||
|
%post -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
|
||||||
|
%postun -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -160,6 +178,12 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
|
|||||||
# Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly.
|
# Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly.
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
|
%files -n libguilereadline-%{greadsuff}
|
||||||
|
%defattr(-,root,root)
|
||||||
|
# please leave .so file here [bnc#765436]
|
||||||
|
%{_libdir}/libguilereadline-v-%{libgreadver}.so
|
||||||
|
%{_libdir}/libguilereadline-v-%{libgreadver}.so.%{libgreadver}*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/guile-snarf
|
%{_bindir}/guile-snarf
|
||||||
|
Loading…
Reference in New Issue
Block a user