--- a/ChangeLog	Mon Jun 16 06:48:11 2008 +0000
+++ b/ChangeLog	Mon Jun 16 07:02:46 2008 +0000
@@ -1,3 +1,11 @@
+2008-06-16  Wang Xin  <[email protected]>
+
+	* SUNWgnome-panel.spec: Add the dependency to libsexy.
+	* base-specs/notification-daemon.spec: Remove 01-no-libsexy.
+	* SUNWlibsexy.spec: Moved from spec-files-other.
+	* copyright/SUNWlibsexy.copyright: Moved from spec-files-other.
+	* patches/notification-daemon-01-no-libsexy.diff: Removed.
+
 2008-06-16  Padraig O'Briain  <[email protected]>
 
 	* base-spec/librsvg.spec: Add patch librsvg-01-license.diff

--- a/SUNWgnome-panel.spec	Mon Jun 16 06:48:11 2008 +0000
+++ b/SUNWgnome-panel.spec	Mon Jun 16 07:02:46 2008 +0000
@@ -44,6 +44,7 @@
 BuildRequires: SUNWlxml-devel
 BuildRequires: SUNWlxml-python
 BuildRequires: SUNWlibrsvg-devel
+BuildRequires: SUNWlibsexy-devel
 Requires: SUNWgnome-panel-root
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-config
@@ -59,6 +60,7 @@
 Requires: SUNWevolution-data-server
 Requires: SUNWiso-codes
 Requires: SUNWdbus
+Requires: SUNWlibsexy
 
 BuildRequires: SUNWtgnome-tsol-libs-devel
 %if %option_without_fox
@@ -331,6 +333,8 @@
 %endif
 
 %changelog
+* Fri Jun 16 2008 - [email protected]
+- Add new dependency to libsexy.
 * Wed Apr 9 2008 - [email protected]
 - Fix packaging.
 * Tue Apr 8 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWlibsexy.spec	Mon Jun 16 07:02:46 2008 +0000
@@ -0,0 +1,98 @@
+#
+# spec file for package SUNWlibsexy
+#
+# includes module(s): libsexy
+#
+# Owner: erwannc
+
+%include Solaris.inc
+
+Name:         SUNWlibsexy
+License:      Other
+Group:        System/Libraries
+Version:      0.1.11
+Summary:      libsexy is a collection of GTK+ widgets that extend the functionality of such standard widget.
+Source:       http://releases.chipx86.com/libsexy/libsexy/libsexy-%{version}.tar.gz
+URL:          http://www.chipx86.com/wiki/Libsexy
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Docdir:	      %{_defaultdocdir}/doc
+SUNW_BaseDir: %{_basedir}
+SUNW_Copyright: %{name}.copyright
+
+%ifnarch sparc
+# these packages are only avavilable on x86
+# =========================================
+
+Autoreqprov:  on
+BuildRequires: SUNWgnome-base-libs-devel
+BuildRequires: SUNWlxml-devel
+BuildRequires: SUNWiso-codes-devel
+Requires: SUNWgnome-base-libs
+Requires: SUNWlxml
+Requires: SUNWiso-codes
+
+%package devel
+Summary:       %{summary} - development files
+SUNW_BaseDir:  %{_basedir}
+%include default-depend.inc
+Requires:      %name
+
+%prep
+%setup -q -n libsexy-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+libtoolize --copy --force
+aclocal $ACLOCAL_FLAGS
+autoheader
+automake -a -c -f 
+autoconf
+./configure --prefix=%{_prefix} \
+		--libdir=%{_libdir} \
+        --disable-gtk-doc
+make -j $CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+%files 
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %dir %{_libdir}
+%{_libdir}/*.so*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %dir %{_includedir}
+%dir %attr (0755, root, bin) %dir %{_includedir}/libsexy
+%{_includedir}/libsexy/*
+%dir %attr (0755, root, sys) %dir %{_datadir}
+%dir %attr (0755, root, bin) %dir %{_datadir}/gtk-doc
+%{_datadir}/gtk-doc/*
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+# endif for "ifnarch sparc"
+%endif
+
+%changelog
+* Wed Mar 26 2008 - [email protected]
+- change to not build this component on SPARC
+* Wed Feb 13 2008 - [email protected]
+- moved to SFO
+* Fri Aug 24 2007 Erwann Chenede <[email protected]>
+- bumped to 0.1.11 and removed patch
+* Fri Feb 16 2007 - Doug Scott <[email protected]>
+- Fixed perm for gtk-doc directory
+* Wed Nov 22 2006 - [email protected]
+- Initial spec

--- a/base-specs/notification-daemon.spec	Mon Jun 16 06:48:11 2008 +0000
+++ b/base-specs/notification-daemon.spec	Mon Jun 16 07:02:46 2008 +0000
@@ -22,8 +22,6 @@
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
-#date:2007-03-22 owner:jedy type:branding
-Patch1:       notification-daemon-01-no-libsexy.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
@@ -45,7 +43,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %ifos linux
@@ -96,5 +93,7 @@
 
 
 %changelog
+* Fri Jun 16 2008 - [email protected]
+- Remove 01-no-libsexy to bring the libsexy dependency back.
 * Thu Mar 25 2007 - [email protected]
 - Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/copyright/SUNWlibsexy.copyright	Mon Jun 16 07:02:46 2008 +0000
@@ -0,0 +1,32 @@
+For the avoidance of doubt, except that if any license choice other
+than GPL or LGPL is available it will apply instead, Sun elects to
+use only the General Public License version 2 (GPLv2) at this time
+for any software where a choice of GPL license versions is made
+available with the language indicating that GPLv2 or any later
+version may be used, or where a choice of which version of the GPL
+is applied is otherwise unspecified.
+
+--------------------------------------------------------------------
+ Copyright (C) 2006 Christian Hammond.
+ Copyright (C) 2005 Nathan Fredrickson
+ Copyright (C) 2004 Christian Persch
+ Copyright (C) 2004 Crispin Flowerday
+ Copyright (C) 2004-2006 Christian Hammond.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA  02111-1307, USA.
+ 
+--------------------------------------------------------------------
+

--- a/patches/notification-daemon-01-no-libsexy.diff	Mon Jun 16 06:48:11 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-diff -u -r notification-daemon-0.3.7/configure.ac notification-daemon-0.3.7-new/configure.ac
---- notification-daemon-0.3.7/configure.ac	2007-02-28 13:16:16.000000000 +0800
-+++ notification-daemon-0.3.7-new/configure.ac	2007-03-12 14:44:10.682081000 +0800
-@@ -82,7 +82,6 @@
- 	glib-2.0 >= $REQ_GLIB_VERSION, \
- 	dbus-1 >= $REQ_DBUS_VERSION, \
- 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
--	libsexy >= $REQ_SEXY_VERSION, \
- 	gconf-2.0, \
- 	libwnck-1.0 \
- "
-diff -u -r notification-daemon-0.3.7/src/themes/standard/theme.c notification-daemon-0.3.7-new/src/themes/standard/theme.c
---- notification-daemon-0.3.7/src/themes/standard/theme.c	2007-01-26 12:20:15.000000000 +0800
-+++ notification-daemon-0.3.7-new/src/themes/standard/theme.c	2007-03-12 14:44:01.482755000 +0800
-@@ -1,7 +1,6 @@
- #include "config.h"
- 
- #include <gtk/gtk.h>
--#include <libsexy/sexy-url-label.h>
- 
- typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
- typedef void (*UrlClickedCb)(GtkWindow *nw, const char *url);
-@@ -799,7 +798,7 @@
- 	gtk_widget_show(vbox);
- 	gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
- 
--	windata->body_label = sexy_url_label_new();
-+	windata->body_label = gtk_label_new(NULL);
- 	gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
- 	gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
- 	gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
-@@ -874,7 +873,7 @@
- 	gtk_label_set_markup(GTK_LABEL(windata->summary_label), str);
- 	g_free(str);
- 
--	sexy_url_label_set_markup(SEXY_URL_LABEL(windata->body_label), body);
-+	gtk_label_set_markup(GTK_LABEL(windata->body_label), body);
- 
- 	if (body == NULL || *body == '\0')
- 		gtk_widget_hide(windata->body_label);