2008-06-04 Damien Carbery <[email protected]>
authordcarbery
Wed, 04 Jun 2008 19:45:00 +0000
changeset 12586 f41271040383
parent 12585 2ad66f4cb6a1
child 12587 e7a13b874945
2008-06-04 Damien Carbery <[email protected]> * SUNWgnome-desklets.spec: Make %{_bindir}/gdesklets a relative symlink as absolute symlinks are not permitted by Solaris WOS. * base-specs/gtksourceview.spec: Add "-lgailutil" to LIBS so that libgailutil is linked in when libgnomecanvas is linked. libgnomecanvas.so includes some gail functions. * SUNWgnome-libs.spec: Add desktop_gnome_thumbnail_cache.schemas to %files and %post root.
ChangeLog
SUNWgnome-desklets.spec
SUNWgnome-libs.spec
base-specs/gtksourceview.spec
--- a/ChangeLog	Wed Jun 04 19:35:57 2008 +0000
+++ b/ChangeLog	Wed Jun 04 19:45:00 2008 +0000
@@ -1,10 +1,20 @@
-2008-06-04  Stephen Browne  <set EMAIL_ADDRESS environment variable>
+2008-06-04  Damien Carbery <[email protected]>
+
+	* SUNWgnome-desklets.spec: Make %{_bindir}/gdesklets a relative symlink
+	  as absolute symlinks are not permitted by Solaris WOS.
+	* base-specs/gtksourceview.spec: Add "-lgailutil" to LIBS so that
+	  libgailutil is linked in when libgnomecanvas is linked.
+	  libgnomecanvas.so includes some gail functions.
+	* SUNWgnome-libs.spec: Add desktop_gnome_thumbnail_cache.schemas to
+	  %files and %post root.
+
+2008-06-04  Stephen Browne  <[email protected]>
 
 	* base-specs/nautilus.spec:
 	* patches/nautilus-07-lockdown.diff, 
 	* patches/nautilus-09-interface-changes-indiana.diff,
 	* patches/nautilus-09-interface-changes.diff,
-	* patches/nautilus-10-trusted-extensions.diff: bump  'n port to 2.23.3
+	* patches/nautilus-10-trusted-extensions.diff: bump 'n port to 2.23.3
 	* patches/nautilus-13-redirect-cd-window.diff: remove upstream patch
 
 2008-06-04  Darren Kenny  <[email protected]>
--- a/SUNWgnome-desklets.spec	Wed Jun 04 19:35:57 2008 +0000
+++ b/SUNWgnome-desklets.spec	Wed Jun 04 19:45:00 2008 +0000
@@ -56,6 +56,11 @@
 %install
 %gdesklets.install -d %name-%version 
 
+# Change %{_bindir}/gdesklets symlink to a relative one.
+cd $RPM_BUILD_ROOT%{_bindir}
+rm gdesklets
+ln -s  ../lib/gdesklets/gdesklets
+
 # fixes %_datadir/gdesklets/Displays/Calendar/gfx/months/README
 chmod -R a+rX $RPM_BUILD_ROOT
 
@@ -110,6 +115,9 @@
 
 
 %changelog
+* Wed Jun 04 2008 - [email protected]
+- Make %{_bindir}/gdesklets a relative symlink as absolute symlinks are not
+  permitted by Solaris WOS.
 * Mon Oct 15 2007 - [email protected]
 - make all files in the package readable
 * Thu Oct 11 2007 - [email protected]
--- a/SUNWgnome-libs.spec	Wed Jun 04 19:35:57 2008 +0000
+++ b/SUNWgnome-libs.spec	Wed Jun 04 19:45:00 2008 +0000
@@ -203,6 +203,7 @@
   echo '         $SDIR/desktop_gnome_peripherals_mouse.schemas';
   echo '         $SDIR/desktop_gnome_sound.schemas';
   echo '         $SDIR/desktop_gnome_thumbnailers.schemas';
+  echo '         $SDIR/desktop_gnome_thumbnail_cache.schemas';
   echo '         $SDIR/desktop_gnome_typing_break.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
@@ -296,6 +297,7 @@
 %{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 %{_sysconfdir}/gconf/schemas/desktop_gnome_sound.schemas
 %{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnailers.schemas
+%{_sysconfdir}/gconf/schemas/desktop_gnome_thumbnail_cache.schemas
 %{_sysconfdir}/gconf/schemas/desktop_gnome_typing_break.schemas
 %{_sysconfdir}/sound
 
@@ -307,6 +309,8 @@
 %endif
 
 %changelog
+* Wed Jun 04 2008 - [email protected]
+- Add desktop_gnome_thumbnail_cache.schemas to %files and %post root.
 * Tue Jun 03 2008 - [email protected]
 - Add "-lgailutil" to LIBS so that libgailutil is linked in when libgnomecanvas 
   is linked. libgnomecanvas.so includes some gail functions.
--- a/base-specs/gtksourceview.spec	Wed Jun 04 19:35:57 2008 +0000
+++ b/base-specs/gtksourceview.spec	Wed Jun 04 19:45:00 2008 +0000
@@ -81,7 +81,7 @@
 
 
 export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%_ldflags -lgailutil"
 ./configure --prefix=%{_prefix}			\
 	    --datadir=%{_datadir}       	\
 	    --sysconfdir=%{_sysconfdir}		\
@@ -114,6 +114,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jun 04 2008 - [email protected]
+- Add "-lgailutil" to LIBS so that libgailutil is linked in when libgnomecanvas
+  is linked. libgnomecanvas.so includes some gail functions.
 * Wed May 30 2007 - [email protected]
 - Unbump from 1.90.0 to 1.8.5. Version 1.90.0 is a move toward version 2.0
   which is incompatible with 1.x. This breaks gedit and gnome-python-desktop.