# HG changeset patch
# User bc99092
# Date 1152563206 0
# Node ID de0aa86394085f1217223e2ae1bf06b0b9ea924d
# Parent  ba94a0d2c6ae35d7b9db590e796b2b4326b503f8
2006-07-10  Brian Cameron  <brian.cameron@sun.com>

        * librsvg.spec, patches/librsvg-02-fixfunc.diff: Bump to 2.14.4.
        * gnome-doc-utils.spec: Bump to 0.6.1
        * gst-fluendo-mp3.spec: Bump to 0.10.7
        * zenity.spec: Bump to 2.14.2

diff -r ba94a0d2c6ae -r de0aa8639408 gnome-doc-utils.spec
--- a/gnome-doc-utils.spec	Mon Jul 10 16:50:14 2006 +0000
+++ b/gnome-doc-utils.spec	Mon Jul 10 20:26:46 2006 +0000
@@ -8,7 +8,7 @@
 Name:			gnome-doc-utils
 License:		GPL
 Group:			System/Libraries
-Version:		0.6.0
+Version:		0.6.1
 Release:		3
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -86,6 +86,8 @@
 %{_datadir}/xml2po/*
 
 %changelog
+* Mon Jul 10 2006 - brian.cameron@sun.com
+- Bump to 0.6.1.
 * Sun Mar 12 2006 - damien.carbery@sun.com
 - Bump to 0.6.0.
 * Mon Feb 27 2006 - damien.carbery@sun.com
diff -r ba94a0d2c6ae -r de0aa8639408 gst-fluendo-mp3.spec
--- a/gst-fluendo-mp3.spec	Mon Jul 10 16:50:14 2006 +0000
+++ b/gst-fluendo-mp3.spec	Mon Jul 10 20:26:46 2006 +0000
@@ -1,5 +1,5 @@
 #
-# spec file for package gst-fluendo-mp3
+# spec file for package gst-fluendo-mpegdemux
 #
 # Copyright (c) 2006 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
 # This means that it must not be released onto opensolaris.org.           #
 ###########################################################################
 
-Name:           gst-fluendo-mp3
+Name:           gst-fluendo-mpegdemux
 License:        MIT
-Version:        0.10.2
-Release:        1
+Version:        0.10.7
+Release:        2
 Distribution:   Java Desktop System
 Vendor:         Sun Microsystems, Inc.
 Group:          Libraries/Multimedia
 Summary:        GStreamer Streaming-media framework plug-ins.
 URL:            http://core.fluendo.com/
 Source:         http://core.fluendo.com/gstreamer/src/%{name}/%{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/gst-fluendo-mp3-%{version}-root
+BuildRoot:      %{_tmppath}/gst-fluendo-mpegdemux-%{version}-root
 Docdir:         %{_defaultdocdir}/doc
 Autoreqprov:    on
 Prereq:         /sbin/ldconfig
@@ -44,7 +44,7 @@
 GStreamer MP3 Plugin.
 
 %prep
-%setup -n gst-fluendo-mp3-%{version} -q
+%setup -n gst-fluendo-mpegdemux-%{version} -q
 
 %build
 
@@ -57,7 +57,7 @@
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
 FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 glib-gettextize -f
-aclocal -I ./m4 -I ./common/m4 $ACLOCAL_FLAGS
+aclocal -I ./m4 $ACLOCAL_FLAGS
 libtoolize --copy --force
 autoheader
 autoconf
@@ -93,6 +93,9 @@
 %{_libdir}/gstreamer-%{majorminor}/lib*.so
 
 %changelog
+* Mon Jul 10 2006 - brian.cameron@sun.com
+- Bump to 0.10.7.
+
 * Thu Apr 27 2006 - damien.carbery@sun.com
 - Bump to 0.10.2.
 
diff -r ba94a0d2c6ae -r de0aa8639408 librsvg.spec
--- a/librsvg.spec	Mon Jul 10 16:50:14 2006 +0000
+++ b/librsvg.spec	Mon Jul 10 20:26:46 2006 +0000
@@ -8,7 +8,7 @@
 Name:         librsvg
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      2.14.3
+Version:      2.14.4
 Release:      1 
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -17,6 +17,7 @@
 Source1:      rsvg.1.gz
 Source2:      librsvg-2.3.gz
 Patch1:       librsvg-01-no-def-file.diff
+Patch2:       librsvg-02-fixfunc.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}/librsvg
@@ -61,6 +62,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifos linux
@@ -130,6 +132,10 @@
 %{_datadir}/gtk-doc/html/librsvg
 
 %changelog
+* Mon Jul 10 2006 - brian.cameron@sun.com
+- Bump to 2.14.4.  Add patch to redefine __PRETTY_FUNCTION__ to
+  __func__ so it compiles on Solaris.
+
 * Mon Apr 03 2006 - damien.carbery@sun.com
 - Bump to 2.14.3.
 
diff -r ba94a0d2c6ae -r de0aa8639408 patches/librsvg-02-fixfunc.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/librsvg-02-fixfunc.diff	Mon Jul 10 20:26:46 2006 +0000
@@ -0,0 +1,15 @@
+--- librsvg-2.14.4/rsvg-private.h-orig	2006-07-10 14:52:46.470841000 -0500
++++ librsvg-2.14.4/rsvg-private.h	2006-07-10 14:55:02.507975000 -0500
+@@ -346,6 +346,12 @@ void rsvg_return_if_fail_warning (const 
+ 								  const char *expression,
+ 								  GError **error);
+ 
++#ifndef __PRETTY_FUNCTION__
++#ifdef __sun
++#define __PRETTY_FUNCTION__ __func__
++#endif
++#endif
++
+ #define rsvg_return_if_fail(expr, error)		G_STMT_START{			\
+      if G_LIKELY(expr) { } else       					\
+        {								\
diff -r ba94a0d2c6ae -r de0aa8639408 zenity.spec
--- a/zenity.spec	Mon Jul 10 16:50:14 2006 +0000
+++ b/zenity.spec	Mon Jul 10 20:26:46 2006 +0000
@@ -8,7 +8,7 @@
 Name:         zenity
 License:      LGPL
 Group:        System/GUI/GNOME
-Version:      2.14.1
+Version:      2.14.2
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -99,6 +99,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jul 10 2006 - brian.cameron@sun.com
+- Bump to 2.14.2.
+
 * Tue Apr 11 2006 - damien.carbery@sun.com
 - Bump to 2.14.1.