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.
2008-06-06 Damien Carbery <[email protected]>
authordcarbery
Fri, 06 Jun 2008 15:34:10 +0000
changeset 12617 e38fdf277c5f
parent 12616 c6e1e47aae28
child 12618 382f892c2cc8
2008-06-06 Damien Carbery <[email protected]> * closed/SUNWzz-gnome-l10n.spec: Change references to SUNWdesktop-search-libs-l10n to SUNWw3m-l10n. The pkg has been renamed. * patches/SUNWtgnome-xagent-01-trusted-extensions.diff: Rework.
ChangeLog file | annotate | diff | comparison | revisions
closed/SUNWzz-gnome-l10n.spec file | annotate | diff | comparison | revisions
patches/SUNWtgnome-xagent-01-trusted-extensions.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Fri Jun 06 09:56:23 2008 +0000
+++ b/ChangeLog	Fri Jun 06 15:34:10 2008 +0000
@@ -1,3 +1,10 @@
+2008-06-06  Damien Carbery <[email protected]>
+
+	* closed/SUNWzz-gnome-l10n.spec: Change references to
+	  SUNWdesktop-search-libs-l10n to SUNWw3m-l10n. The pkg has been
+	  renamed.
+	* patches/SUNWtgnome-xagent-01-trusted-extensions.diff: Rework.
+
 2008-06-06  Padraig O'Briain <[email protected]>
 
 	* base-specs/avahi.spec: Uprev to avahi 0.6.22; remove patch -14.
@@ -22,7 +29,6 @@
 
 	* base-specs/libgpg-error.spec: Bump to 1.6
 
->>>>>>> .r14287
 2008-06-06  Jeff Cai<[email protected]>
 
 	* SUNWlibgcrypt.spec, base-specs/libgcrypt.spec: Bump to 1.4.1.
--- a/closed/SUNWzz-gnome-l10n.spec	Fri Jun 06 09:56:23 2008 +0000
+++ b/closed/SUNWzz-gnome-l10n.spec	Fri Jun 06 15:34:10 2008 +0000
@@ -26,7 +26,6 @@
 #Requires: SUNWgnome-xml
 BuildRequires: SUNWapoc-adapter-gconf-l10n
 BuildRequires: SUNWdesktop-search-l10n
-BuildRequires: SUNWdesktop-search-libs-l10n
 BuildRequires: SUNWfsexam-l10n
 BuildRequires: SUNWgksu-l10n
 BuildRequires: SUNWgnome-a11y-dasher-l10n
@@ -103,6 +102,7 @@
 %ifnarch sparc
 BuildRequires: SUNWvirt-manager-l10n
 %endif
+BuildRequires: SUNWw3m-l10n
 BuildRequires: SUNWxdg-user-dirs-gtk-l10n
 BuildRequires: SUNWxdg-user-dirs-l10n
 
@@ -438,7 +438,6 @@
 GNOME_PKGS='
 SUNWapoc-adapter-gconf-l10n
 SUNWdesktop-search-l10n
-SUNWdesktop-search-libs-l10n
 SUNWfsexam-l10n
 SUNWgksu-l10n
 SUNWgnome-a11y-dasher-l10n
@@ -507,6 +506,7 @@
 SUNWlibgsf-l10n
 SUNWlibgtop-l10n
 SUNWprint-monitor-l10n
+SUNWw3m-l10n
 SUNWxdg-user-dirs-gtk-l10n
 SUNWxdg-user-dirs-l10n
 '
@@ -1665,6 +1665,9 @@
 %endif
 
 %changelog
+* Fri Jun 06 2008 - [email protected]
+- Change references to SUNWdesktop-search-libs-l10n to SUNWw3m-l10n. The pkg
+  has been renamed.
 * Thu May 29 2008 - [email protected]
 - Add %{name}-[m,d]-$LANG.copyright
 * Fri Apr 18 2008 - [email protected]
--- a/patches/SUNWtgnome-xagent-01-trusted-extensions.diff	Fri Jun 06 09:56:23 2008 +0000
+++ b/patches/SUNWtgnome-xagent-01-trusted-extensions.diff	Fri Jun 06 15:34:10 2008 +0000
@@ -1,14 +1,14 @@
-diff -urN -x '*.orig' gnome-session-2.22.1.1/gnome-session/Makefile.am ../SUNWtgnome-xagent-2.21.4.hacked/gnome-session-2.22.1.1/gnome-session/Makefile.am
---- gnome-session-2.22.1.1/gnome-session/Makefile.am	2008-01-11 17:50:08.036684000 +0000
-+++ ../SUNWtgnome-xagent-2.22.1.1.hacked/gnome-session-2.20.3/gnome-session/Makefile.am	2008-01-11 17:49:03.375239000 +0000
+diff -urN -x '*.orig' gnome-session-2.22.2/gnome-session/Makefile.am ../SUNWtgnome-xagent-2.21.4.hacked/gnome-session-2.22.2/gnome-session/Makefile.am
+--- gnome-session-2.22.2/gnome-session/Makefile.am	2008-01-11 17:50:08.036684000 +0000
++++ ../SUNWtgnome-xagent-2.22.2.hacked/gnome-session-2.20.3/gnome-session/Makefile.am	2008-01-11 17:49:03.375239000 +0000
 @@ -4,6 +4,7 @@
  
  INCLUDES =						\
  	$(GNOME_SESSION_CFLAGS)				\
 +	$(LIBWNCK_CFLAGS)				\
- 	$(DBUS_GLIB_CFLAGS)				\
  	$(STANDARD_PROPERTIES_CFLAGS)			\
  	$(WARN_CFLAGS)					\
+ 	$(DISABLE_DEPRECATED_CFLAGS)			\
 @@ -35,6 +36,14 @@
  gnome_session_properties_LDADD = $(GNOME_SESSION_LIBS)
  splash_test_LDADD = $(X_LIBS) $(GNOME_SESSION_LIBS)
upstream/oracle/spec-files