fix dependency issue(CR6843511, 6843654, 6843579, 6843587, 6843581, 6845023, 6843582)
--- a/ChangeLog Tue Jun 02 06:39:49 2009 +0000
+++ b/ChangeLog Tue Jun 02 06:43:37 2009 +0000
@@ -1,3 +1,20 @@
+2009-06-02 Dave Lin <[email protected]>
+
+ * SUNWdbus-python24.spec
+ * SUNWlibglade.spec
+ * SUNWgtk2.spec
+ * SUNWlibatk.spec
+ * SUNWgnome-spell.spec
+ * SUNWTiff.spec
+ * SUNWgqview.spec
+ * SUNWgnome-themes.spec
+ * SUNWcairo.spec
+ * SUNWdbus-glib.spec
+ * SUNWgnome-cd-burner.spec
+ * SUNWgnome-a11y-libs.spec
+ * SUNWgst-python.spec: Fixed dependency issues(CR6843511,
+ 6843654, 6843579, 6843587, 6843581, 6845023, 6843582).
+
2009-06-02 Jeff Cai <[email protected]>
* copyright/SUNWgnutls.copyright:
--- a/SUNWTiff.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWTiff.spec Tue Jun 02 06:43:37 2009 +0000
@@ -39,6 +39,7 @@
Requires: SUNWlibmsr
Requires: SUNWlibms
Requires: SUNWzlib
+Requires: SUNWjpg
%package devel
Summary: %{summary} - development files
@@ -170,6 +171,8 @@
%{_mandir}/man3tiff/*
%changelog
+* Tue Jun 02 2009 - [email protected]
+- add 'Requires: SUNWjpg' to fix bug CR6842550
* Thu Sep 4 2008 - [email protected]
- add patch CVE-2008-2327.diff
* Mon Mar 24 2008 - [email protected]
--- a/SUNWcairo.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWcairo.spec Tue Jun 02 06:43:37 2009 +0000
@@ -45,6 +45,8 @@
SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: SUNWcairo
+Requires: SUNWxwinc
+Requires: SUNWpng-devel
%prep
rm -rf %name-%version
@@ -147,5 +149,7 @@
%{_datadir}/gtk-doc
%changelog
+* Tue Jun 02 2009 - [email protected]
+- add 'Requires: SUNWpng-deve/SUNWxwinc' to fix bug CR6842561
* Tue Mar 31 2009 - [email protected]
- initial version(split from SUNWgnome-base-libs)
--- a/SUNWdbus-glib.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWdbus-glib.spec Tue Jun 02 06:43:37 2009 +0000
@@ -42,7 +42,8 @@
Summary: %{summary} - development files
SUNW_BaseDir: %{_basedir}
%include default-depend.inc
-Requires: SUNWglib2
+Requires: SUNWglib2-devel
+Requires: SUNWdbus-devel
%prep
rm -rf %name-%version
@@ -154,6 +155,8 @@
%endif
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843511).
* Tue Mar 10 2009 - [email protected]
- Cleanup based on code review.
* Thu Mar 05 2009 - [email protected]
--- a/SUNWdbus-python24.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWdbus-python24.spec Tue Jun 02 06:43:37 2009 +0000
@@ -43,6 +43,7 @@
# the 2.6 devel package is required because it contains the headers
# (they are not duplicated in this package, since they would be identical)
Requires: SUNWdbus-python26-devel
+Requires: SUNWdbus-devel
%prep
rm -rf %name-%version
@@ -91,6 +92,8 @@
%{_libdir}/python%{pythonver}/pkgconfig/*
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843511).
* Tue Mar 10 2009 - [email protected]
- Cleanup based on code review.
* Thu Mar 05 2009 - [email protected]
--- a/SUNWgnome-a11y-libs.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgnome-a11y-libs.spec Tue Jun 02 06:43:37 2009 +0000
@@ -97,9 +97,9 @@
SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: %{name}
-Requires: SUNWPython
-Requires: SUNWgnome-python-libs
-BuildRequires: SUNWPython-devel
+Requires: SUNWPython26
+Requires: SUNWgnome-python26-libs
+BuildRequires: SUNWPython26-devel
BuildRequires: SUNWpython26-setuptools
BuildRequires: SUNWgnome-python-libs-devel
@@ -393,6 +393,8 @@
%{_libdir}/python2.6/vendor-packages/*
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6845023).
* Tue Apr 14 2009 - [email protected]
- set PKG_CONFIG_TOP_BUILD_DIR to fix top_builddir issue when using at-spi uninstalled pc file
* Fri Apr 3 2009 - [email protected]
--- a/SUNWgnome-cd-burner.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgnome-cd-burner.spec Tue Jun 02 06:43:37 2009 +0000
@@ -43,6 +43,7 @@
Requires: SUNWlxml
Requires: SUNWhal
Requires: SUNWgksu
+Requires: SUNWgnome-file-mgr
%description
Brasero is a application to burn CD/DVD for the Gnome Desktop. It is designed to be as simple as possible and has some unique features to enable users to create their discs easily and quickly.
@@ -194,6 +195,8 @@
%endif
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843581).
* Mon Jun 01 2009 - [email protected]
- Bump to 2.27.2
* Sat Map 30 2009 - [email protected]
--- a/SUNWgnome-spell.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgnome-spell.spec Tue Jun 02 06:43:37 2009 +0000
@@ -45,6 +45,7 @@
SUNW_BaseDir: %{_basedir}
Requires: %{name} = %{version}
%include default-depend.inc
+Requires: SUNWglib2-devel
%prep
rm -rf %name-%version
@@ -158,6 +159,8 @@
%{_includedir}/*
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843587).
* Wed Sep 17 2008 - [email protected]
- Add copyright.
* Tue Jul 29 2008 - [email protected]
--- a/SUNWgnome-themes.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgnome-themes.spec Tue Jun 02 06:43:37 2009 +0000
@@ -85,6 +85,7 @@
Requires: SUNWperl584core
Requires: SUNWlibms
Requires: SUNWperl-xml-parser
+Requires: SUNWgtk2-devel
%if %build_l10n
%package l10n
@@ -421,6 +422,8 @@
%restart_fmri icon-cache
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843581).
* Tue May 12 2009 - [email protected]
- Remove 'Requires: SUNWgnome-themes-devel' from devel pkg to fix the circular dependency issue.
* Fri Apr 3 2009 - [email protected]
--- a/SUNWgqview.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgqview.spec Tue Jun 02 06:43:37 2009 +0000
@@ -21,13 +21,8 @@
SUNW_Copyright: SUNWgqview.copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-%if %option_with_gnu_iconv
+Requires: SUNWuiu8
Requires: SUNWgtk2
-Requires: SUNWgnu-libiconv
-Requires: SUNWgnu-gettext
-%else
-Requires: SUNWuiu8
-%endif
BuildRequires: SUNWgtk2-devel
BuildRequires: SUNWgnome-common-devel
@@ -46,9 +41,6 @@
%build
export CFLAGS="%optflags -DEDITOR_GIMP"
-%if %option_with_gnu_iconv
-export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl -lsocket"
-%endif
export LDFLAGS="-lX11 -lsocket"
%gqview.build -d %name-%version
@@ -92,6 +84,9 @@
%endif
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843581).
+- removed the obsoleted option %option_with_gnu_iconv.
* Mon Sep 16 2008 - [email protected]
- Revised copyright file
* Wed Aug 21 2008 - [email protected]
--- a/SUNWgst-python.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgst-python.spec Tue Jun 02 06:43:37 2009 +0000
@@ -37,6 +37,7 @@
# the 2.6 devel package is required because it contains the headers
# (they are not duplicated in this package, since they would be identical)
Requires: SUNWgst-python26-devel
+Requires: SUNWgnome-python-libs-devel
%prep
rm -rf %name-%version
@@ -88,6 +89,8 @@
%{_libdir}/python%{pythonver}/pkgconfig/*
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843582).
* Tue Feb 24 2009 - [email protected]
- set PYTHON and PKG_CONFIG_PATH so the correct python version and
dependencies are picked up
--- a/SUNWgtk2.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWgtk2.spec Tue Jun 02 06:43:37 2009 +0000
@@ -68,6 +68,11 @@
Requires: SUNWlibmsr
Requires: SUNWpapi
Requires: SUNWpng-devel
+Requires: SUNWglib2-devel
+Requires: SUNWcairo-devel
+Requires: SUNWpango-devel
+Requires: SUNWlibatk-devel
+Requires: SUNWxwinc
%if %build_l10n
%package l10n
@@ -285,6 +290,8 @@
%endif
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843654, 6843582, 6843579).
* Wed Apr 29 2009 - [email protected]
- delete post root script (not needed), simplify post script
* Mon Apr 06 2009 - [email protected]
--- a/SUNWlibatk.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWlibatk.spec Tue Jun 02 06:43:37 2009 +0000
@@ -37,6 +37,7 @@
SUNW_BaseDir: %{_basedir}
%include default-depend.inc
Requires: SUNWlibatk
+Requires: SUNWglib2-devel
%if %build_l10n
%package l10n
@@ -132,5 +133,7 @@
%endif
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843654).
* Tue Mar 31 2009 - [email protected]
- initial version(split from SUNWgnome-base-libs)
--- a/SUNWlibglade.spec Tue Jun 02 06:39:49 2009 +0000
+++ b/SUNWlibglade.spec Tue Jun 02 06:43:37 2009 +0000
@@ -41,6 +41,8 @@
%include default-depend.inc
Requires: SUNWlibglade
Requires: SUNWPython
+Requires: SUNWlxml-devel
+Requires: SUNWgtk2-devel
%prep
rm -rf %name-%version
@@ -129,5 +131,7 @@
%{_mandir}/man3/*
%changelog
+* Tue Jun 02 2009 - [email protected]
+- fixed dependency issue(CR6843654).
* Tue Mar 31 2009 - [email protected]
- initial version(split from SUNWgnome-base-libs)