rpms/guile-gnome-platform/devel guile-gnome-platform-2.16.1-libdir.patch, NONE, 1.1 guile-gnome-platform.spec, 1.5, 1.6 guile-gnome-platform-2.16.1-guilever.patch, 1.2, NONE

Sun Dec 28 07:16:24 UTC 2008

Author: salimma

Update of /cvs/pkgs/rpms/guile-gnome-platform/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv533

Modified Files:
	guile-gnome-platform.spec 
Added Files:
	guile-gnome-platform-2.16.1-libdir.patch 
Removed Files:
	guile-gnome-platform-2.16.1-guilever.patch 
Log Message:
* Sun Dec 28 2008 Michel Salim <salimma at fedoraproject.org> - 2.16.1-2
- Multiarch fix: detect libdir at runtime for files in %{_datadir}


guile-gnome-platform-2.16.1-libdir.patch:

--- NEW FILE guile-gnome-platform-2.16.1-libdir.patch ---
--- guile-gnome-platform-2.16.1/glib/gnome.scm.in.libdir	2008-04-27 15:42:55.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/gnome.scm.in	2008-12-28 01:41:15.000000000 -0500
@@ -143,14 +143,12 @@
   (module-define! (resolve-module '(gnome)) 'gnome-version version)
 
   (let ((guile-gnome-dir "@guilegnomedir@")
-        (guile-gnome-lib-dir "@guilegnomelibdir@")
-        (libdir "@libdir@"))
+        (guile-gnome-lib-dir
+          (if (zero? (system "uname -i | grep 64 > /dev/null"))
+              "/usr/lib64/guile-gnome- at API_VERSION@"
+              "/usr/lib/guile-gnome- at API_VERSION@")))
 
     (add-to-load-path! guile-gnome-dir)
 
-    ;; Resolve (gnome gw ...) wrapper links to libguile-gnome-gobject.
-    (if (not (member libdir '("/usr/lib" "/usr/local/lib")))
-        (ld-library-path-prepend! libdir))
-  
     ;; Resolve (gnome gw ...) wrappers.
     (ld-library-path-prepend! guile-gnome-lib-dir))))
--- guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in.libdir	2007-05-20 12:40:30.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in	2008-12-28 01:46:51.000000000 -0500
@@ -15,39 +15,25 @@
 # interpreter is as follows, removing `# ' on each line:
 
 # #! /bin/sh
-# exec guile-gnome -s $0 "$@"
+# exec guile-gnome- at API_VERSION@ -s $0 "$@"
 # !#
 
 # This will allow the shell to find `guile-gnome' in the path.
 
-# Hack around guile-1.6's lack of /usr/local paths in its load-dir.
-# (Otherwise a user looking for g-wrap / guile-lib installed in
-# /usr/local will be unpleasantly surprised.)
-localpath=/usr/local/share/guile/site:/usr/local/share/guile/1.6:/usr/local/share/guile
-
 if test "x$GUILE_LOAD_PATH" = "x"; then
-  GUILE_LOAD_PATH="@guilegnomedir@":$localpath
+  GUILE_LOAD_PATH="@guilegnomedir@"
 else
-  # Because GUILE_LOAD_PATH is essentially a user customization, allow
-  # it to have precedence over $localpath.
-  GUILE_LOAD_PATH="@guilegnomedir@":$GUILE_LOAD_PATH:$localpath
-fi
-
-# Probably will always be necessary to resolve libguile-gnome-gobject
-# link.
-if test @libdir@ != /usr/lib -a @libdir@ != /usr/local/lib; then
-  if test "x$LD_LIBRARY_PATH" = "x"; then
-    LD_LIBRARY_PATH=@libdir@
-  else
-    LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
-  fi
+  GUILE_LOAD_PATH="@guilegnomedir@":$GUILE_LOAD_PATH
 fi
 
 # Can be removed after g-wrap is fixed.
+(uname -i | grep 64 > /dev/null) && LIBDIR=/usr/lib64 || LIBDIR=/usr/lib
+GUILE_LIBDIR=$LIBDIR/guile-gnome- at API_VERSION@
+
 if test "x$LD_LIBRARY_PATH" = "x"; then
-  LD_LIBRARY_PATH=@guilegnomelibdir@
+  LD_LIBRARY_PATH=$GUILE_LIBDIR
 else
-  LD_LIBRARY_PATH=@guilegnomelibdir@:$LD_LIBRARY_PATH
+  LD_LIBRARY_PATH=$GUILE_LIBDIR:$LD_LIBRARY_PATH
 fi
 
 export GUILE_LOAD_PATH LD_LIBRARY_PATH
--- guile-gnome-platform-2.16.1/glib/gnome/gobject/Makefile.in.libdir	2008-07-03 11:18:05.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/gnome/gobject/Makefile.in	2008-12-28 01:41:15.000000000 -0500
@@ -802,7 +802,7 @@
 
 install-data-local: Makefile config.scm.in
 	$(mkinstalldirs) $(DESTDIR)$(moduledir)
-	sed -e "s|@guilegnomegobjectlibpath\@|$(libdir)/libguile-gnome-gobject- at API_VERSION@|" \
+	sed -e "s|@API_VERSION\@|@API_VERSION@|" \
 	    $(srcdir)/config.scm.in > $(DESTDIR)$(moduledir)/config.scm
 	chmod 644 $(DESTDIR)$(moduledir)/config.scm
 
--- guile-gnome-platform-2.16.1/glib/gnome/gobject/config.scm.in.libdir	2007-05-20 12:40:30.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/gnome/gobject/config.scm.in	2008-12-28 01:41:15.000000000 -0500
@@ -27,4 +27,7 @@
 (define-module (gnome gobject config)
   :export     (*guile-gnome-gobject-lib-path*))
 
-(define *guile-gnome-gobject-lib-path* "@guilegnomegobjectlibpath@")
+(define *guile-gnome-gobject-lib-path*
+  (if (zero? (system "uname -i | grep 64 > /dev/null"))
+    "/usr/lib64/libguile-gnome-gobject- at API_VERSION@"
+    "/usr/lib/libguile-gnome-gobject- at API_VERSION@"))


Index: guile-gnome-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/devel/guile-gnome-platform.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- guile-gnome-platform.spec	28 Dec 2008 01:31:50 -0000	1.5
+++ guile-gnome-platform.spec	28 Dec 2008 07:15:53 -0000	1.6
@@ -1,15 +1,15 @@
 Name:           guile-gnome-platform
 Version:        2.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Guile wrapper collection for the GNOME library stack
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.gnu.org/software/guile-gnome/
 Source0:        http://ftp.gnu.org/pub/gnu/guile-gnome/%{name}/%{name}-%{version}.tar.gz
-Patch0:          guile-gnome-platform-2.16.1-guilever.patch
+Patch0:         guile-gnome-platform-2.16.1-libdir.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=565837
-Patch1:          guile-gnome-platform-2.16.1-infofix.patch
+Patch1:         guile-gnome-platform-2.16.1-infofix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  guile-cairo-devel
@@ -22,8 +22,8 @@
 BuildRequires:  texinfo
 Requires:       guile
 
-#Requires(post): /sbin/install-info
-#Requires(preun): /sbin/install-info
+Requires(post):  /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 The guile-gnome project brings the power of Scheme to your graphical
@@ -46,18 +46,12 @@
 developing applications that use %{name}.
 
 
-
-
 %prep
 %setup -q
-%patch0 -p1 -b .guilever
+%patch0 -p1 -b .libdir
 %patch1 -p1 -b .infofix
 
 
-#Fix OPTFLAGS on gtk/gnome/gw build
-sed -i "s|CFLAGS = -g|CFLAGS = @CFLAGS@ -g|" gtk/gnome/gw/Makefile.in
-
-
 %build
 export LDFLAGS="-lORBit-2 -lbonobo-2"
 
@@ -67,7 +61,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 
 #Remove .la files
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -75,6 +69,14 @@
 #Remove deprecated file
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+#Multiarch timestamp fixes
+touch -r glib/bin/guile-gnome.in.libdir \
+      $RPM_BUILD_ROOT%{_bindir}/guile-gnome-2
+touch -r glib/gnome/gobject/config.scm.in.libdir \
+      $RPM_BUILD_ROOT%{_datadir}/guile-gnome-2/gnome/gobject/config.scm
+touch -r glib/gnome.scm.in.libdir \
+      $RPM_BUILD_ROOT%{_datadir}/guile/site/gnome-2.scm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,6 +137,9 @@
 
 
 %changelog
+* Sun Dec 28 2008 Michel Salim <salimma at fedoraproject.org> - 2.16.1-2
+- Multiarch fix: detect libdir at runtime for files in %%{_datadir}
+
 * Sat Dec 27 2008 Michel Salim <salimma at fedoraproject.org> - 2.16.1-1
 - Update to 2.16.1
 - Corrected license to GPLv2+


--- guile-gnome-platform-2.16.1-guilever.patch DELETED ---


