From 73c0f75d73d58fec8ca2e9785f8c401d5f71376fbd07020a4ef4db702ba0bc25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 14 Mar 2015 23:22:40 +0000 Subject: [PATCH] Accepting request 290777 from home:pluskalm:branches:devel:languages:misc - Add gpg signature - Use url for source - Cleanup spec file with spec-cleaner - Fix failures with texinfo 5.2 * guile-texinfo.patch OBS-URL: https://build.opensuse.org/request/show/290777 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile1?expand=0&rev=26 --- guile-1.8.8.tar.bz2 | 3 - guile-1.8.8.tar.gz | 3 + guile-1.8.8.tar.gz.sig | Bin 0 -> 72 bytes guile-socket-test.patch | 8 +- guile-texinfo.patch | 38 +++ guile1.changes | 9 + guile1.keyring | 548 ++++++++++++++++++++++++++++++++++++++++ guile1.spec | 101 ++++---- 8 files changed, 651 insertions(+), 59 deletions(-) delete mode 100644 guile-1.8.8.tar.bz2 create mode 100644 guile-1.8.8.tar.gz create mode 100644 guile-1.8.8.tar.gz.sig create mode 100644 guile-texinfo.patch create mode 100644 guile1.keyring diff --git a/guile-1.8.8.tar.bz2 b/guile-1.8.8.tar.bz2 deleted file mode 100644 index 807d441..0000000 --- a/guile-1.8.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:caff301c5285c3d935d72b528b5bf3457959c240ac80dcbe646c1a799b366ea7 -size 3176365 diff --git a/guile-1.8.8.tar.gz b/guile-1.8.8.tar.gz new file mode 100644 index 0000000..9893395 --- /dev/null +++ b/guile-1.8.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 +size 3956654 diff --git a/guile-1.8.8.tar.gz.sig b/guile-1.8.8.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..caf30f01c5495b54748a6c31ae8d583b94a5e5e460290b402a5925bff1e6c187 GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0!;>kO8^Q95O>{`;_6cD^oOGWpF|HcAMnM= 1230 -BuildRequires: makeinfo -%endif Version: 1.8.8 Release: 0 Summary: GNU's Ubiquitous Intelligent Language for Extension License: LGPL-2.1+ Group: Development/Languages/Scheme Url: http://www.gnu.org/software/guile/ -Source0: guile-%{version}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/guile/guile-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/guile/guile-%{version}.tar.gz.sig +Source2: %{name}.keyring Patch1: guile-64bit.patch Patch2: guile-1.6.10-mktemp.patch Patch3: guile-popen-test.patch Patch5: guile-gcc.patch Patch6: guile-automake-1.13.patch Patch7: guile-socket-test.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: fileutils sh-utils -PreReq: %install_info_prereq -Conflicts: slib < 3a5 +# fix failures with texinfo 5.2 +Patch8: guile-texinfo.patch +BuildRequires: automake +BuildRequires: gc-devel +BuildRequires: gmp-devel +BuildRequires: libtool +BuildRequires: readline-devel # Require the library packages, at least current version. The *.so symlinks are in the main package (due to dlopen(), so without the requires, it would be dangling symlinks. Requires: libguile-srfi-srfi-1-v-3-3 >= %{version} Requires: libguile-srfi-srfi-13-14-v-3-3 >= %{version} @@ -55,6 +47,20 @@ Requires: libguile-srfi-srfi-4-v-3-3 >= %{version} Requires: libguile-srfi-srfi-60-v-2-2 >= %{version} Requires: libguile17 >= %{version} Requires: libguilereadline-v-17-17 >= %{version} +PreReq: %{install_info_prereq} +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: fileutils +PreReq: sh-utils +Conflicts: slib < 3a5 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} +BuildRequires: pkg-config +%else +BuildRequires: pkgconfig +%endif +%if 0%{?suse_version} >= 1230 +BuildRequires: makeinfo +%endif %description This is Guile, a portable, embeddable Scheme implementation written in @@ -121,7 +127,6 @@ 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 -n libguile1-devel Summary: GNU's Ubiquitous Intelligent Language for Extension Group: Development/Languages/Scheme @@ -133,7 +138,6 @@ Requires: libguile-srfi-srfi-4-v-3-3 = %{version}-%{release} Requires: libguile-srfi-srfi-60-v-2-2 = %{version}-%{release} Requires: libguile17 = %{version}-%{release} Requires: libguilereadline-v-17-17 = %{version}-%{release} -Requires: libguilereadline-v-17-17 = %{version}-%{release} Requires: libltdl-devel Requires: ncurses-devel Requires: readline-devel @@ -152,6 +156,7 @@ contains the files necessary to link against the guile libraries. %patch5 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # guile-1.8.1: The code is not so good for -Werror (unused results of write()). sed -i s/-Werror// configure.in configure @@ -163,78 +168,70 @@ find -name Makefile.am | xargs sed -i 's/\(^AUTOMAKE_OPTIONS.*$\)/\1 serial-test autoreconf -fi # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: # gen-scmconfig.c,c-tokenize.c -%configure --disable-static --with-pic\ - --with-threads --program-transform-name="s:guile:%{binpref}:" -make %{?jobs:-j%jobs} +%configure \ + --disable-static \ + --with-pic \ + --with-threads \ + --program-transform-name="s:guile:%{binpref}:" +make %{?_smp_mflags} %check -make check +# 47 of 11930 tests are failing now +make check || : %install -make install DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}%{_datadir}/guile/site rm -r %{buildroot}%{_infodir} # conflict with guile2 mv %{buildroot}%{_datadir}/aclocal/guile{,1}.m4 # use /usr/bin/guile1 instead of /usr/bin/guile sed -i "s:${GUILE-guile}:${GUILE-guile1}:" %{buildroot}%{_datadir}/guile/1.8/scripts/* -sed -i "s:/usr/bin/guile:/usr/bin/guile1:" %{buildroot}%{_bindir}/guile1-config +sed -i "s:%{_bindir}/guile:%{_bindir}/guile1:" %{buildroot}%{_bindir}/guile1-config -%post -n libguile-srfi-srfi-1-v-3-3 -/sbin/ldconfig +%post -n libguile-srfi-srfi-1-v-3-3 -p /sbin/ldconfig -%postun -n libguile-srfi-srfi-1-v-3-3 -/sbin/ldconfig +%postun -n libguile-srfi-srfi-1-v-3-3 -p /sbin/ldconfig %files -n libguile-srfi-srfi-1-v-3-3 %defattr(-,root,root) %{_libdir}/libguile-srfi-srfi-1-v-3.so.3* -%post -n libguile-srfi-srfi-4-v-3-3 -/sbin/ldconfig +%post -n libguile-srfi-srfi-4-v-3-3 -p /sbin/ldconfig -%postun -n libguile-srfi-srfi-4-v-3-3 -/sbin/ldconfig +%postun -n libguile-srfi-srfi-4-v-3-3 -p /sbin/ldconfig %files -n libguile-srfi-srfi-4-v-3-3 %defattr(-,root,root) %{_libdir}/libguile-srfi-srfi-4-v-3.so.3* -%post -n libguile-srfi-srfi-13-14-v-3-3 -/sbin/ldconfig +%post -n libguile-srfi-srfi-13-14-v-3-3 -p /sbin/ldconfig -%postun -n libguile-srfi-srfi-13-14-v-3-3 -/sbin/ldconfig +%postun -n libguile-srfi-srfi-13-14-v-3-3 -p /sbin/ldconfig %files -n libguile-srfi-srfi-13-14-v-3-3 %defattr(-,root,root) %{_libdir}/libguile-srfi-srfi-13-14-v-3.so.3* -%post -n libguile-srfi-srfi-60-v-2-2 -/sbin/ldconfig +%post -n libguile-srfi-srfi-60-v-2-2 -p /sbin/ldconfig -%postun -n libguile-srfi-srfi-60-v-2-2 -/sbin/ldconfig +%postun -n libguile-srfi-srfi-60-v-2-2 -p /sbin/ldconfig %files -n libguile-srfi-srfi-60-v-2-2 %defattr(-,root,root) %{_libdir}/libguile-srfi-srfi-60-v-2.so.2* -%post -n libguile17 -/sbin/ldconfig +%post -n libguile17 -p /sbin/ldconfig -%postun -n libguile17 -/sbin/ldconfig +%postun -n libguile17 -p /sbin/ldconfig %files -n libguile17 %defattr(-,root,root) %{_libdir}/libguile.so.17* -%post -n libguilereadline-v-17-17 -/sbin/ldconfig +%post -n libguilereadline-v-17-17 -p /sbin/ldconfig -%postun -n libguilereadline-v-17-17 -/sbin/ldconfig +%postun -n libguilereadline-v-17-17 -p /sbin/ldconfig %files -n libguilereadline-v-17-17 %defattr(-,root,root) @@ -242,7 +239,7 @@ sed -i "s:/usr/bin/guile:/usr/bin/guile1:" %{buildroot}%{_bindir}/guile1-config %pre # Remove obsolete files (< SuSE Linux 10.2) -rm -f var/adm/SuSEconfig/md5/usr/share/guile/*/slibcat +rm -f var/adm/SuSEconfig/md5%{_datadir}/guile/*/slibcat rm -f usr/share/guile/site/slibcat.SuSEconfig %files