openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package slib (Revision d5e0c0cec828dbbebbf840b5add80d9a)

Currently displaying revision d5e0c0cec828dbbebbf840b5add80d9a , Show latest

--- slib.changes.orig
+++ slib.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Jan 28 14:18:42 CET 2010 - pgajdos@suse.cz
+
+- better guile version checking
+
+-------------------------------------------------------------------
 Tue Nov 24 17:51:06 CET 2009 - pgajdos@suse.cz
 
 - updated to 3b2 (see ANNOUNCE)
--- slib.spec.orig
+++ slib.spec
@@ -62,12 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 # We need new guile for registration, see "Incompatible change in guile 1.8.2".
 # During update must be slib-3a5 installed first (See Conflits: slib < 3a5 in guile.spec)
 # because of %triggerin in slib, 3a1 for example, though.
-MAJ=`guile -c "(display (version))" 2>&1 | sed "s:$[0-9]$\.$[0-9]$\.$[0-9]$:\1:"`
-MIN=`guile -c "(display (version))" 2>&1 | sed "s:$[0-9]$\.$[0-9]$\.$[0-9]$:\2:"`
-MIK=`guile -c "(display (version))" 2>&1 | sed "s:$[0-9]$\.$[0-9]$\.$[0-9]$:\3:"`
 if [ -d usr/share/guile/site ] ; then
+  GUILE_VERSION=`guile -c "(display (version))" | sed "s:\.::g"`
   # guile is instaled
-  if [ 1 -le $MAJ -a 8 -le $MIN -a 7 -le $MIK ]; then
+  if [ $GUILE_VERSION -ge 182 ]; then
     # we have guile >= 1.8.2
     if [ ! -e usr/share/guile/site/slib ] ; then
       # link slib library into guile
@@ -95,8 +93,9 @@ exit 0
 # During update must be slib-3a5 installed first (See Conflits: slib < 3a5 in guile.spec)
 # because of %triggerin in slib, 3a1 for example, though.
 if [ -d usr/share/guile/site ] ; then
+  GUILE_VERSION=`guile -c "(display (version))" | sed "s:\.::g"`
   # guile is instaled
-  if [ "`usr/bin/guile -c '(define foo (begin (set! foo 1) (+ foo 1)))' 2>&1`" ]; then
+  if [ $GUILE_VERSION -ge 182 ]; then
   # we have guile >= 1.8.2
     if [ ! -e usr/share/guile/site/slib ] ; then
       # link slib library into guile

Places

File project.diff of Package slib (Revision d5e0c0cec828dbbebbf840b5add80d9a)

Places