rpms/guile-gnome-platform/devel guile-gnome-platform-2.16.1-guilever.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 guile-gnome-platform.spec, 1.3, 1.4 sources, 1.2, 1.3

Michel Alexandre Salim salimma at fedoraproject.org
Fri Dec 26 20:03:21 UTC 2008 

Author: salimma

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

Modified Files:
	.cvsignore guile-gnome-platform.spec sources 
Added Files:
	guile-gnome-platform-2.16.1-guilever.patch 
Log Message:
* Fri Dec 26 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:

--- NEW FILE guile-gnome-platform-2.16.1-guilever.patch ---
--- guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in.guilever	2007-05-20 12:40:30.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in	2008-12-26 14:54:59.000000000 -0500
@@ -15,7 +15,7 @@
 # interpreter is as follows, removing `# ' on each line:
 
 # #! /bin/sh
-# exec guile-gnome -s $0 "$@"
+# exec guile-gnome-2 -s $0 "$@"
 # !#
 
 # This will allow the shell to find `guile-gnome' in the path.
@@ -23,7 +23,7 @@
 # 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
+localpath=/usr/local/share/guile/site:/usr/local/share/guile/1.8:/usr/local/share/guile
 
 if test "x$GUILE_LOAD_PATH" = "x"; then
   GUILE_LOAD_PATH="@guilegnomedir@":$localpath
--- guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in.guilever	2007-05-20 12:40:30.000000000 -0400
+++ guile-gnome-platform-2.16.1/glib/bin/guile-gnome.in	2008-12-26 14:58:41.000000000 -0500
@@ -15,15 +15,15 @@
 # interpreter is as follows, removing `# ' on each line:
 
 # #! /bin/sh
-# exec guile-gnome -s $0 "$@"
+# exec guile-gnome-2 -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.
+# Hack around guile-1.8'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
+localpath=/usr/local/share/guile/site:/usr/local/share/guile/1.8:/usr/local/share/guile
 
 if test "x$GUILE_LOAD_PATH" = "x"; then
   GUILE_LOAD_PATH="@guilegnomedir@":$localpath


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2007 21:08:26 -0000	1.2
+++ .cvsignore	26 Dec 2008 20:02:51 -0000	1.3
@@ -1 +1 @@
-guile-gnome-platform-2.15.93.tar.gz
+guile-gnome-platform-2.16.1.tar.gz


Index: guile-gnome-platform.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/devel/guile-gnome-platform.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- guile-gnome-platform.spec	6 Sep 2008 14:13:09 -0000	1.3
+++ guile-gnome-platform.spec	26 Dec 2008 20:02:51 -0000	1.4
@@ -1,19 +1,19 @@
 Name:           guile-gnome-platform
-Version:        2.15.93
-Release:        8%{?dist}
+Version:        2.16.1
+Release:        1%{?dist}
 Summary:        Guile wrapper collection for the GNOME library stack
 
 Group:          Applications/System
-License:        GPLv2
+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-allowed-options.patch
+Patch0:		 guile-gnome-platform-2.16.1-guilever.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch:    ppc64
-
 BuildRequires:  guile-cairo-devel
-BuildRequires:  g-wrap-devel >= 1.8.9
+# 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
 Requires:       guile
 
@@ -45,16 +45,7 @@
 
 %prep
 %setup -q
-
-#Allowed options grom g-wrap-1.9.9
-%patch0 -p1 -b .allowed-options
-
-#Fix default paths
-sed -i "s|local/||" glib/bin/guile-gnome.in
-sed -i "s|share/guile|share/guile/site|" configure
-sed -i "s|>= 2.18||" configure
-
-sed -i "s|guile-gnome|guile-gnome-0|" defs/guile-gnome-defs.pc.in
+%patch0 -p1 -b .guilever
 
 
 #Fix OPTFLAGS on gtk/gnome/gw build
@@ -85,11 +76,23 @@
 
 %post
 /sbin/ldconfig
-/sbin/install-info %{_infodir}/guile-gnome-tutorial.info.gz %{_infodir}/dir || :
+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
-    /sbin/install-info --delete %{_infodir}/guile-gnome-tutorial.info.gz %{_infodir}/dir || :
+   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
@@ -97,31 +100,39 @@
 
 
 %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-0
+%{_libdir}/*.so*
+%dir %{_libdir}/guile-gnome-2
 %dir %{_libdir}/orbit-2.0
-%{_libdir}/guile-gnome-0/*.so.*
-%{_libdir}/orbit-2.0/*.so.*
-%{_datadir}/guile-gnome-0
-%{_datadir}/guile/site/gnome-0.scm
-%{_infodir}/*.info.gz
+%{_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-0/*.so
-%{_libdir}/orbit-2.0/*.so
+#%{_libdir}/*.so
+#%{_libdir}/guile-gnome-2/*.so
+#%{_libdir}/orbit-2.0/*.so
 %{_libdir}/pkgconfig/*
-%{_includedir}/guile-gnome-0
+%{_includedir}/guile-gnome-2
 
 
 
 %changelog
+* Fri Dec 26 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guile-gnome-platform/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2007 21:08:26 -0000	1.2
+++ sources	26 Dec 2008 20:02:51 -0000	1.3
@@ -1 +1 @@
-c74e081f8312cdbd4a5bc62e8239203c  guile-gnome-platform-2.15.93.tar.gz
+fde233c17863b7dfbe6937e4b5c00669  guile-gnome-platform-2.16.1.tar.gz

More information about the fedora-extras-commits mailing list