From b944366e6315f344e27ddfe2a67342c43d3848311cd748a640ddcbc257956f0f Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 2 Oct 2011 20:09:48 +0000 Subject: [PATCH] Accepting request 85824 from home:plater:lilypond Split off the two guile shared libraries and cleaned up spec file OBS-URL: https://build.opensuse.org/request/show/85824 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=16 --- guile-1.6.10-mktemp.patch | 8 +-- guile-fix_fsf_add.patch | 30 +++++++++++ guile.changes | 7 +++ guile.spec | 108 +++++++++++++++++++++----------------- 4 files changed, 102 insertions(+), 51 deletions(-) create mode 100644 guile-fix_fsf_add.patch diff --git a/guile-1.6.10-mktemp.patch b/guile-1.6.10-mktemp.patch index 0042275..e63180c 100644 --- a/guile-1.6.10-mktemp.patch +++ b/guile-1.6.10-mktemp.patch @@ -1,6 +1,8 @@ ---- libguile/guile-snarf.in -+++ libguile/guile-snarf.in -@@ -71,8 +71,7 @@ +Index: libguile/guile-snarf.in +=================================================================== +--- libguile/guile-snarf.in.orig 2011-05-05 18:14:35.000000000 +0200 ++++ libguile/guile-snarf.in 2011-09-22 17:56:41.010417735 +0200 +@@ -84,8 +84,7 @@ fi cpp_ok_p=false if [ x"$TMPDIR" = x ]; then TMPDIR="/tmp" ; else : ; fi diff --git a/guile-fix_fsf_add.patch b/guile-fix_fsf_add.patch new file mode 100644 index 0000000..a407fdd --- /dev/null +++ b/guile-fix_fsf_add.patch @@ -0,0 +1,30 @@ +Index: libguile/ieee-754.h +=================================================================== +--- libguile/ieee-754.h.orig 2010-12-14 20:15:17.000000000 +0200 ++++ libguile/ieee-754.h 2011-09-28 22:08:48.630280428 +0200 +@@ -13,8 +13,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ ++ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ MA 02110-1301 USA. */ + + #ifndef SCM_IEEE_754_H + #define SCM_IEEE_754_H 1 +Index: module/language/elisp/compile-tree-il.scm +=================================================================== +--- module/language/elisp/compile-tree-il.scm.orig 2010-12-14 20:15:17.000000000 +0200 ++++ module/language/elisp/compile-tree-il.scm 2011-09-28 22:13:38.709698469 +0200 +@@ -14,8 +14,8 @@ + ;; + ;; You should have received a copy of the GNU General Public License + ;; along with this program; see the file COPYING. If not, write to +-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +-;; Boston, MA 02111-1307, USA. ++;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++;; Boston, MA 02110-1301, USA. + + ;;; Code: + diff --git a/guile.changes b/guile.changes index 0bd87d4..6eaed62 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 30 16:12:52 UTC 2011 - davejplater@gmail.com + +- Split off libguile-2_0-22 and libguilereadline-v-18-18 packages in + preparation for bthe submission of legacy package guile. +- Cleaned spec file. + ------------------------------------------------------------------- Mon Aug 15 14:08:41 UTC 2011 - pgajdos@novell.com diff --git a/guile.spec b/guile.spec index ef750ac..c4dbb1b 100644 --- a/guile.spec +++ b/guile.spec @@ -16,12 +16,13 @@ # +# define the name used for versioning libs and directories. +%define guilevers 2.0 Name: guile -BuildRequires: gc-devel gmp-devel libffi-devel libunistring-devel pkg-config readline-devel +BuildRequires: gc-devel gmp-devel libffi46-devel libunistring-devel pkg-config readline-devel License: LGPL-3.0+ and GPL-3.0+ and FDL-1.3+ Group: Development/Languages/Scheme -AutoReqProv: on Version: 2.0.2 Release: 1 Summary: GNU's Ubiquitous Intelligent Language for Extension @@ -29,6 +30,8 @@ Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch +# Fix the wrong FSF address in a few headers. +Patch3: %{name}-fix_fsf_add.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -39,61 +42,54 @@ 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. +%package -n libguile-2_0-22 +Group: Development/Languages/Scheme +Summary: GNU's Ubiquitous Intelligent Language for Extension +%description -n libguile-2_0-22 +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. -Authors: --------- - Jim Blandy - George Carrette - Aubrey Jaffer - Gary Houston - Tom Lord - Anthony Green - Mikael Djurfeldt - Mark Galassi - Tim Pierce - Marius Vollmer - Tom Tromey +%package -n libguilereadline-v-18-18 +Group: Development/Languages/Scheme +Summary: GNU's Ubiquitous Intelligent Language for Extension + +%description -n libguilereadline-v-18-18 +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 License: LGPL v2.1 or later Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension -Requires: %{name} = %{version} gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel +Requires: gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel +Requires: libguilereadline-v-18-18 = %{version}-%{release} +Requires: libguile-2_0-22 = %{version}-%{release} +Conflicts: libguile1-devel %description devel 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. - - -Authors: --------- - Jim Blandy - George Carrette - Aubrey Jaffer - Gary Houston - Tom Lord - Anthony Green - Mikael Djurfeldt - Mark Galassi - Tim Pierce - Marius Vollmer - Tom Tromey - %prep %setup -q %patch1 %patch2 +%patch3 # force rebuild with non-broken makeinfo #rm -f doc/*/*.info %build # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: # gen-scmconfig.c,c-tokenize.c -%configure --disable-static --with-pic\ - --with-threads + +%configure --disable-static --with-pic \ + --with-threads --disable-silent-rules make %check @@ -103,13 +99,6 @@ LD_LIBRARY_PATH="." make check make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/guile/site -%clean -rm -fr $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz @@ -123,26 +112,49 @@ rm -fr $RPM_BUILD_ROOT rm -f var/adm/SuSEconfig/md5/usr/share/guile/*/slibcat rm -f usr/share/guile/site/slibcat.SuSEconfig +%post -n libguile-2_0-22 +/sbin/ldconfig + +%postun -n libguile-2_0-22 +/sbin/ldconfig + +%files -n libguile-2_0-22 +%defattr(-,root,root) +%{_libdir}/libguile-%{guilevers}.so.22* + +%post -n libguilereadline-v-18-18 +/sbin/ldconfig + +%postun -n libguilereadline-v-18-18 +/sbin/ldconfig + +%files -n libguilereadline-v-18-18 +%defattr(-,root,root) +%{_libdir}/libguilereadline-v-18.so.18* + %files %defattr(-,root,root) %doc ABOUT-NLS AUTHORS COPYING* ChangeLog GUILE-VERSION HACKING %doc LICENSE NEWS README THANKS %{_bindir}/* -%{_datadir}/guile -%{_libdir}/libguile*.so.* +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/%{guilevers} +%{_datadir}/%{name}/%{guilevers}/* # NOTE: At least some .so files must be here, required for dynamic-link. -%{_libdir}/libguile*.so -%{_libdir}/libguile*.la %{_mandir}/man1/guile.1.gz -%{_libdir}/guile +%{_libdir}/%{name} %files devel %defattr(-,root,root) -%{_includedir}/* +%dir %{_includedir}/%{name} +%dir %{_includedir}/%{name}/%{guilevers} +%{_includedir}/%{name}/%{guilevers}/* %{_datadir}/aclocal/guile.m4 %doc %{_infodir}/%{name}.info.gz %doc %{_infodir}/%{name}.info-[0-9].gz %doc %{_infodir}/r5rs.info.gz -%{_libdir}/pkgconfig/* +%{_libdir}/libguile*.so +%{_libdir}/libguile*.la +%{_libdir}/pkgconfig/guile-%{guilevers}.pc %changelog