Mercurial Mercurial > upstream > oracle > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RTI#361352 gnome-2-30-s11update S11U1_14
authorleonfan
Thu, 05 Apr 2012 02:29:21 +0000
branchgnome-2-30-s11update
changeset 22362 1aa21b74ad5e
parent 22361 12672c8af127
child 22364 3bd9957b4f9c
RTI#361352 CR#7151514 python-gtk-vnc-26 miss dependency on library/desktop/gtk-vnc
ChangeLog file | annotate | diff | comparison | revisions
base-specs/gtk-vnc.spec file | annotate | diff | comparison | revisions
patches/gtk-vnc-03-buildissue.diff file | annotate | diff | comparison | revisions
specs/SUNWgtk-vnc.spec file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Thu Apr 05 02:27:01 2012 +0000
+++ b/ChangeLog	Thu Apr 05 02:29:21 2012 +0000
@@ -1,3 +1,11 @@
+2012-04-05  Leon Fan  <[email protected]>
+
+	RTI#361352
+        CR#7151514 python-gtk-vnc-26 miss dependency on library/desktop/gtk-vnc
+	* base-specs/gtk-vnc.spec:
+	* patches/gtk-vnc-03-buildissue.diff:
+	* specs/SUNWgtk-vnc.spec:
+
 2012-04-05  Leon Sha  <[email protected]>
 
 	CR#7157311 Bump to 11.2.202.223.
--- a/base-specs/gtk-vnc.spec	Thu Apr 05 02:27:01 2012 +0000
+++ b/base-specs/gtk-vnc.spec	Thu Apr 05 02:29:21 2012 +0000
@@ -24,6 +24,8 @@
 Patch1:         gtk-vnc-01-cp-utf8.diff
 # date:2008-12-16 owner:wangke type:bug bugzilla:564718
 Patch2:         gtk-vnc-02-ff3.6.diff
+# date:2011-03-21 owner:leonfan type:bug bugster:7151514
+Patch3:         gtk-vnc-03-buildissue.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel pygtk2-devel python-devel
@@ -62,6 +64,7 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifos linux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk-vnc-03-buildissue.diff	Thu Apr 05 02:29:21 2012 +0000
@@ -0,0 +1,12 @@
+diff -urN a/plugin/Makefile.am b/plugin/Makefile.am
+--- a/plugin/Makefile.am	2012-03-21 14:15:38.054202916 +0000
++++ b/plugin/Makefile.am	2012-03-21 14:16:29.114046538 +0000
+@@ -12,7 +12,7 @@
+ 	-module -avoid-version
+ gtk_vnc_plugin_la_CFLAGS = \
+ 	-I$(top_srcdir)/src @GTK_CFLAGS@ \
+-	@FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@
++	@FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@
+ 
+ all-local: gtk-vnc-plugin.so
+ 
--- a/specs/SUNWgtk-vnc.spec	Thu Apr 05 02:27:01 2012 +0000
+++ b/specs/SUNWgtk-vnc.spec	Thu Apr 05 02:29:21 2012 +0000
@@ -61,6 +61,12 @@
 
 %include default-depend.inc
 %include desktop-incorporation.inc
+Requires:      library/desktop/gtk-vnc
+Requires:      runtime/python-26
+Requires:      library/python-2/pygtk2-26
+BuildRequires: runtime/python-26
+BuildRequires: library/python-2/setuptools-26
+BuildRequires: library/python-2/pygtk2-26
 
 %package l10n
 Summary:       %{summary} - l10n files
upstream/oracle/spec-files