[guile-gnome-platform] unorphaning for gwave

Chitlesh GOORAH chitlesh at fedoraproject.org
Mon Aug 8 20:11:31 UTC 2011


commit 9fcdbbb599d327775ee1d47d284a86670b75af6c
Author: Chitlesh GOORAH <chitlesh at fedoraproject.org>
Date:   Mon Aug 8 22:11:11 2011 +0200

    unorphaning for gwave

 dead.package                              |    1 -
 guile-gnome-platform-2.16.1-infofix.patch |  154 ++++++++++++++++++++++++
 guile-gnome-platform-2.16.1-libdir.patch  |   93 +++++++++++++++
 guile-gnome-platform.spec                 |  183 +++++++++++++++++++++++++++++
 sources                                   |    1 +
 5 files changed, 431 insertions(+), 1 deletions(-)
---
diff --git a/guile-gnome-platform-2.16.1-infofix.patch b/guile-gnome-platform-2.16.1-infofix.patch
new file mode 100644
index 0000000..ebe8789
--- /dev/null
+++ b/guile-gnome-platform-2.16.1-infofix.patch
@@ -0,0 +1,154 @@
+--- guile-gnome-platform-2.16.1/libgnomeui/doc/guile-gnome-libgnomeui.texi.infofix	2008-06-12 06:28:28.000000000 -0400
++++ guile-gnome-platform-2.16.1/libgnomeui/doc/guile-gnome-libgnomeui.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Libgnomeui: (guile-gnome-libgnomeui.info).  A deprecated GNOME UI lib.
++* Guile-Libgnomeui: (guile-gnome-libgnomeui).  A deprecated GNOME UI lib.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/libglade/doc/guile-gnome-libglade.texi.infofix	2008-06-12 06:28:09.000000000 -0400
++++ guile-gnome-platform-2.16.1/libglade/doc/guile-gnome-libglade.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -27,7 +27,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Libglade: (guile-gnome-libglade.info).  Load GTK+ interfaces from XML.
++* Guile-Libglade: (guile-gnome-libglade).  Load GTK+ interfaces from XML.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/gtk/doc/gtk/guile-gnome-gtk.texi.infofix	2008-06-12 06:29:21.000000000 -0400
++++ guile-gnome-platform-2.16.1/gtk/doc/gtk/guile-gnome-gtk.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -50,7 +50,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Gtk: (guile-gnome-gtk.info).  The GIMP ToolKit.
++* Guile-Gtk: (guile-gnome-gtk).  The GIMP ToolKit.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/gtk/doc/gdk/guile-gnome-gdk.texi.infofix	2008-06-12 06:29:28.000000000 -0400
++++ guile-gnome-platform-2.16.1/gtk/doc/gdk/guile-gnome-gdk.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -72,7 +72,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Gdk: (guile-gnome-gdk.info).  The GIMP Drawing Kit.
++* Guile-Gdk: (guile-gnome-gdk).  The GIMP Drawing Kit.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/atk/doc/guile-gnome-atk.texi.infofix	2008-06-12 06:24:14.000000000 -0400
++++ guile-gnome-platform-2.16.1/atk/doc/guile-gnome-atk.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Atk: (guile-gnome-atk.info).  The Accessibility ToolKit.
++* Guile-Atk: (guile-gnome-atk).  The Accessibility ToolKit.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/libgnomecanvas/doc/guile-gnome-libgnomecanvas.texi.infofix	2008-06-12 06:28:20.000000000 -0400
++++ guile-gnome-platform-2.16.1/libgnomecanvas/doc/guile-gnome-libgnomecanvas.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Libgnomecanvas: (guile-gnome-libgnomecanvas.info).  Structured graphics.
++* Guile-Libgnomecanvas: (guile-gnome-libgnomecanvas).  Structured graphics.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/glib/doc/glib/guile-gnome-glib.texi.infofix	2008-06-12 06:30:10.000000000 -0400
++++ guile-gnome-platform-2.16.1/glib/doc/glib/guile-gnome-glib.texi	2008-12-27 20:14:13.000000000 -0500
+@@ -50,7 +50,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-GLib: (guile-gnome-glib.info).  Functions from the GLib library.
++* Guile-GLib: (guile-gnome-glib).  Functions from the GLib library.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/glib/doc/gobject/guile-gnome-gobject.texi.infofix	2008-06-12 06:29:53.000000000 -0400
++++ guile-gnome-platform-2.16.1/glib/doc/gobject/guile-gnome-gobject.texi	2008-12-27 20:17:00.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-GNOME: GObject: (guile-gnome-gobject.info).  The GLib object system in Scheme.
++* Guile-GObject: (guile-gnome-gobject).  The GLib object system in Scheme.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/gconf/doc/guile-gnome-gconf.texi.infofix	2008-06-12 06:27:46.000000000 -0400
++++ guile-gnome-platform-2.16.1/gconf/doc/guile-gnome-gconf.texi	2008-12-27 20:17:08.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-GConf: (guile-gnome-gconf.info).  GNOME's configuration system.
++* Guile-GConf: (guile-gnome-gconf).  GNOME's configuration system.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/pango/doc/pango/guile-gnome-pango.texi.infofix	2008-06-12 06:29:13.000000000 -0400
++++ guile-gnome-platform-2.16.1/pango/doc/pango/guile-gnome-pango.texi	2008-12-27 20:17:14.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Pango: (guile-gnome-pango.info).  Text layout and rendering.
++* Guile-Pango: (guile-gnome-pango).  Text layout and rendering.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/pango/doc/pangocairo/guile-gnome-pangocairo.texi.infofix	2008-06-12 06:29:08.000000000 -0400
++++ guile-gnome-platform-2.16.1/pango/doc/pangocairo/guile-gnome-pangocairo.texi	2008-12-27 20:17:23.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-PangoCairo: (guile-gnome-pangocairo.info).  Pango+Cairo.
++* Guile-PangoCairo: (guile-gnome-pangocairo).  Pango+Cairo.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/libgnome/doc/guile-gnome-libgnome.texi.infofix	2008-06-12 06:28:14.000000000 -0400
++++ guile-gnome-platform-2.16.1/libgnome/doc/guile-gnome-libgnome.texi	2008-12-27 20:17:29.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-Libgnome: (guile-gnome-libgnome.info).  A GNOME catchall library.
++* Guile-Libgnome: (guile-gnome-libgnome).  A GNOME catchall library.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/corba/doc/guile-gnome-corba.texi.infofix	2008-06-12 06:26:29.000000000 -0400
++++ guile-gnome-platform-2.16.1/corba/doc/guile-gnome-corba.texi	2008-12-27 20:17:37.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-GNOME: CORBA: (guile-gnome-corba.info).  Remote objects with CORBA in Scheme.
++* Guile-CORBA: (guile-gnome-corba).  Remote objects with CORBA in Scheme.
+ @end direntry
+ 
+ @titlepage 
+--- guile-gnome-platform-2.16.1/gnome-vfs/doc/guile-gnome-gnome-vfs.texi.infofix	2008-06-12 06:27:52.000000000 -0400
++++ guile-gnome-platform-2.16.1/gnome-vfs/doc/guile-gnome-gnome-vfs.texi	2008-12-27 20:17:44.000000000 -0500
+@@ -23,7 +23,7 @@
+ 
+ @dircategory The Algorithmic Language Scheme
+ @direntry 
+-* Guile-GNOME-VFS: (guile-gnome-gnome-vfs.info).  The GNOME virtual file system.
++* Guile-GNOME-VFS: (guile-gnome-gnome-vfs).  The GNOME virtual file system.
+ @end direntry
+ 
+ @titlepage 
diff --git a/guile-gnome-platform-2.16.1-libdir.patch b/guile-gnome-platform-2.16.1-libdir.patch
new file mode 100644
index 0000000..a62ac54
--- /dev/null
+++ b/guile-gnome-platform-2.16.1-libdir.patch
@@ -0,0 +1,93 @@
+--- 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@"))
diff --git a/guile-gnome-platform.spec b/guile-gnome-platform.spec
new file mode 100644
index 0000000..10189c9
--- /dev/null
+++ b/guile-gnome-platform.spec
@@ -0,0 +1,183 @@
+Name:           guile-gnome-platform
+Version:        2.16.1
+Release:        5%{?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-libdir.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=565837
+Patch1:         guile-gnome-platform-2.16.1-infofix.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  guile-cairo-devel
+# README says >= 1.9.1 but not 1.9.2
+# but website says 1.9.8
+BuildRequires:  g-wrap-devel >= 1.9.8
+BuildRequires:  libgnomeui-devel, glibc
+# We are patching the .texi sources, fixing invalid directory entries
+# Until the .texi and .info files from upstream are fixed, BR on texinfo
+BuildRequires:  texinfo
+Requires:       guile
+
+Requires(post):  /sbin/install-info
+Requires(preun): /sbin/install-info
+
+%description
+The guile-gnome project brings the power of Scheme to your graphical
+application. guile-gnome modules support the entire GNOME library
+stack: from Pango to GnomeCanvas, GTK+ to GStreamer, Glade to
+GtkSourceView, you will find in guile-gnome a comprehensive
+environment for developing modern applications.
+
+
+%package        devel
+Summary:        Libraries and header files for %{name}
+Group:          Development/Libraries
+
+Requires:       %{name} = %{version}-%{release}
+Requires:       g-wrap-devel, guile-cairo-devel
+Requires:       ORBit2-devel, pkgconfig
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .libdir
+%patch1 -p1 -b .infofix
+
+sed -i "s|gtk_widget_get_allocation|_gtk_widget_get_allocation|" \
+gtk/gnome/gw/gtk-support.c gtk/gnome/gw/gtk-support.h gtk/gnome/overrides/gtk.defs
+
+./scripts/configure-packages guile-gnome-platform
+%build
+export LDFLAGS="-lORBit-2 -lbonobo-2"
+
+%configure --disable-libtool-lock --disable-static --disable-Werror
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+
+#Remove .la files
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+#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
+
+
+%post
+/sbin/ldconfig
+for i in \
+    atk corba gconf gdk glib gnome-vfs gobject gtk \
+    libglade libgnome libgnomecanvas libgnomeui pango pangocairo;
+  do
+    /sbin/install-info \
+      %{_infodir}/guile-gnome-$i.info.gz %{_infodir}/dir || :
+done
+
+%preun
+if [ $1 = 0 ]; then
+   for i in \
+        atk corba gconf gdk glib gnome-vfs gobject gtk \
+        libglade libgnome libgnomecanvas libgnomeui pango pangocairo;
+      do
+        /sbin/install-info --delete \
+          %{_infodir}/guile-gnome-$i.info.gz %{_infodir}/dir || :
+   done
+fi
+
+%postun -p /sbin/ldconfig
+
+
+
+%files
+# .so files needed to load libraries at runtime
+# so they are part of the main package rather than
+# the devel subpackage
+
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README ChangeLog NEWS
+%{_bindir}/*
+%{_libdir}/*.so*
+%dir %{_libdir}/guile-gnome-2
+%dir %{_libdir}/orbit-2.0
+%{_libdir}/guile-gnome-2/*.so*
+%{_libdir}/orbit-2.0/*.so*
+%{_datadir}/guile-gnome-2
+%{_datadir}/guile/site/gnome-2.scm
+%{_infodir}/*.info*.gz
+
+
+%files  devel
+%defattr(-,root,root,-)
+%doc HACKING
+#%{_libdir}/*.so
+#%{_libdir}/guile-gnome-2/*.so
+#%{_libdir}/orbit-2.0/*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/guile-gnome-2
+
+
+
+%changelog
+* Mon Aug 08 2011 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 2.16.1-5
+- Rebuilt for F-16
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.16.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* 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+
+
+* Sat Sep 06 2008 Xavier Lamien <lxtnow[at]gmail.com> - 2.15.93-8
+- Rebuild for rawhide.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.15.93-7
+- Autorebuild for GCC 4.3
+
+* Tue Sep 11 2007 XAvier Lamien < lxtnow[at]gmail.com > - 2.15.93-6
+- linked missing libraries.
+
+* Mon Sep 10 2007 Xavier Lamien < lxtnow[at]gmail.com > - 2.15.93-5
+- Fixed optflags for gtk build.
+- Enhanced requires.
+
+* Sun Sep 02 2007 Xavier Lamien < lxtnow[at]gmail.com > - 2.15.93-4
+- Exclude pcc64.
+- Fixed Requires & default permissions on files.
+
+* Mon Aug 27 2007 XAvier Lamien < lxtnow[at]gmail.com > - 2.15.93-3
+- Add missing BR & Requires.
+
+* Sun Aug 19 2007 Xavier Lamien < lxtnow[at]gmail.com > - 2.15.93-2
+- Patched to build against g-wrap-1.9.9.
+
+* Tue Jul 10 2007 Xavier Lamien < lxtnow[at]gmail.com > - 2.15.93-1
+- Initial RPM Release.
diff --git a/sources b/sources
new file mode 100644
index 0000000..0be1130
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+b6113c3acf506e5cd555116a1e86da47  guile-gnome-platform-2.16.1.tar.gz


More information about the scm-commits mailing list