2010-08-09 Christian Kelly <[email protected]>
authorchrisk
Mon, 09 Aug 2010 20:32:30 +0000
changeset 19985 62e3256a8655
parent 19984 a2744815cc6d
child 19986 8161073c591f
2010-08-09 Christian Kelly <[email protected]> * base-specs/libproxy.spec, patches/libproxy-02-bad-cmake.diff, patches/libproxy-02-disable-utils.diff: Fix wonky patches. * patches/gir-repository-02-babl.diff: Add hunk to fix build issue. * specs/SUNWmoovida-plugins.spec, specs/SUNWcontact-lookup-applet.spec, specs/SUNWobby.spec, specs/SUNWgnome-display-mgr.spec, specs/SUNWtsclient.spec, specs/SUNWccsm.spec, specs/SUNWgnome-pilot, specs/SUNWxchat.spec, specs/SUNWcompiz-fusion-extra.spec, specs/SUNWcompiz-fusion-main.spec, specs/SUNWgnome-media-apps.spec, specs/SUNWnwam-manager.spec, specs/SUNWtransmission.spec, specs/SUNWbluefish.spec, specs/SUNWtgnome-tsoljdsdevmgr.spec, specs/SUNWevolution-data-server.spec, specs/SUNWavant.spec, specs/SUNWgnome-media.spec, specs/SUNWlibgoffice.spec, specs/SUNWvinagre.spec, specs/SUNWlibgweather.spec, specs/SUNWgnome-a11y-libs.spec, specs/SUNWlibgsf.spec, specs/SUNWcodeina.spec, specs/SUNWgnome-commander.spec, specs/SUNWtgnome-tstripe.spec, specs/SUNWjokosher.spec, specs/SUNWpython-notify.spec, specs/SUNWseahorse-plugins.spec, specs/SUNWcheese.spec, specs/SUNWvirt-manager.spec, specs/SUNWplanner.spec, specs/SUNWgtk-vnc.spec: Fix %files. * specs/SUNWgir-repository.spec: Remove files delivered by libsoup.
ChangeLog
base-specs/libproxy.spec
patches/gir-repository-02-babl.diff
patches/libproxy-02-bad-cmake.diff
patches/libproxy-02-disable-utils.diff
patches/librsvg-01-python.diff
patches/librsvg-01-sgml.diff
patches/librsvg-02-python.diff
specs/SUNWavant.spec
specs/SUNWbluefish.spec
specs/SUNWccsm.spec
specs/SUNWcheese.spec
specs/SUNWcodeina.spec
specs/SUNWcompiz-fusion-extra.spec
specs/SUNWcompiz-fusion-main.spec
specs/SUNWcontact-lookup-applet.spec
specs/SUNWevolution-data-server.spec
specs/SUNWgir-repository.spec
specs/SUNWgnome-a11y-libs.spec
specs/SUNWgnome-commander.spec
specs/SUNWgnome-display-mgr.spec
specs/SUNWgnome-media-apps.spec
specs/SUNWgnome-media.spec
specs/SUNWgnome-pilot.spec
specs/SUNWgtk-vnc.spec
specs/SUNWjokosher.spec
specs/SUNWlibgoffice.spec
specs/SUNWlibgsf.spec
specs/SUNWlibgweather.spec
specs/SUNWmoovida-plugins.spec
specs/SUNWnwam-manager.spec
specs/SUNWobby.spec
specs/SUNWplanner.spec
specs/SUNWpython-notify.spec
specs/SUNWseahorse-plugins.spec
specs/SUNWtgnome-tsoljdsdevmgr.spec
specs/SUNWtgnome-tstripe.spec
specs/SUNWtransmission.spec
specs/SUNWtsclient.spec
specs/SUNWvinagre.spec
specs/SUNWvirt-manager.spec
specs/SUNWxchat.spec
--- a/ChangeLog	Mon Aug 09 20:25:41 2010 +0000
+++ b/ChangeLog	Mon Aug 09 20:32:30 2010 +0000
@@ -1,3 +1,26 @@
+2010-08-09  Christian Kelly  <[email protected]>
+
+	* base-specs/libproxy.spec, patches/libproxy-02-bad-cmake.diff, 
+	  patches/libproxy-02-disable-utils.diff: Fix wonky patches.
+	* patches/gir-repository-02-babl.diff: Add hunk to fix build issue.
+	* specs/SUNWmoovida-plugins.spec, specs/SUNWcontact-lookup-applet.spec,
+	  specs/SUNWobby.spec, specs/SUNWgnome-display-mgr.spec,
+	  specs/SUNWtsclient.spec, specs/SUNWccsm.spec, specs/SUNWgnome-pilot,
+	  specs/SUNWxchat.spec, specs/SUNWcompiz-fusion-extra.spec,
+	  specs/SUNWcompiz-fusion-main.spec, specs/SUNWgnome-media-apps.spec,
+	  specs/SUNWnwam-manager.spec, specs/SUNWtransmission.spec,
+	  specs/SUNWbluefish.spec, specs/SUNWtgnome-tsoljdsdevmgr.spec,
+	  specs/SUNWevolution-data-server.spec, specs/SUNWavant.spec,
+	  specs/SUNWgnome-media.spec, specs/SUNWlibgoffice.spec,
+	  specs/SUNWvinagre.spec, specs/SUNWlibgweather.spec,
+	  specs/SUNWgnome-a11y-libs.spec, specs/SUNWlibgsf.spec,
+	  specs/SUNWcodeina.spec, specs/SUNWgnome-commander.spec,
+	  specs/SUNWtgnome-tstripe.spec, specs/SUNWjokosher.spec,
+	  specs/SUNWpython-notify.spec, specs/SUNWseahorse-plugins.spec,
+	  specs/SUNWcheese.spec, specs/SUNWvirt-manager.spec,
+	  specs/SUNWplanner.spec, specs/SUNWgtk-vnc.spec: Fix %files.
+	* specs/SUNWgir-repository.spec: Remove files delivered by libsoup.
+	
 2010-08-08  Niall Power <[email protected]>
 
 	* specs/SUNWgnome-time-slider.spec: Bump  to tarball version
--- a/base-specs/libproxy.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/base-specs/libproxy.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -29,7 +29,7 @@
 Source:       http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
 #owner:wangke date:2009-09-11 type:branding
 Patch1:       libproxy-01-build.diff
-Patch2:       libproxy-03-disable-utils.diff
+Patch2:       libproxy-02-disable-utils.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %package devel
@@ -78,6 +78,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Aug  9 2010 - [email protected]
+- Fix patch name.
 * Wed Aug  4 2010 - [email protected]
 - Disable build of utils, due to cmake error, add 
   libproxy-03-disable-utils.diff.
--- a/patches/gir-repository-02-babl.diff	Mon Aug 09 20:25:41 2010 +0000
+++ b/patches/gir-repository-02-babl.diff	Mon Aug 09 20:32:30 2010 +0000
@@ -23,3 +23,23 @@
  endif BUILD_BABL
  
  if BUILD_UNIQUE
+--- gir-repository-0.6.5.orig/gir/Makefile.am	2010-08-09 22:02:12.872729499 +0100
++++ gir-repository-0.6.5/gir/Makefile.am	2010-08-09 22:03:10.725233435 +0100
+@@ -6,7 +6,7 @@
+ XPATH_TESTS =
+ COMMON_CUSTOM_LDFLAGS= -avoid-version -rdynamic
+ 
+-AVAHI_GIRSOURCES = AvahiCore-0.6.gir
++AVAHI_GIRSOURCES = 
+ if BUILD_AVAHI
+ CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
+ endif
+@@ -878,7 +878,7 @@
+              --output $@ \
+              --pkg avahi-gobject \
+              $(AVAHI_INCLUDEDIR)/*.h
+-BUILT_GIRSOURCES += Avahi-0.6.gir
++BUILT_GIRSOURCES += 
+ endif BUILD_AVAHI
+ 
+ if BUILD_BABL
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/libproxy-02-disable-utils.diff	Mon Aug 09 20:32:30 2010 +0000
@@ -0,0 +1,8 @@
+diff -ruN libproxy-0.4.2.orig/CMakeLists.txt libproxy-0.4.2/CMakeLists.txt
+--- libproxy-0.4.2.orig/CMakeLists.txt	2010-08-07 16:29:12.717828962 +0100
++++ libproxy-0.4.2/CMakeLists.txt	2010-08-07 16:29:19.616226238 +0100
+@@ -67,4 +67,3 @@
+ add_subdirectory(libmodman)
+ add_subdirectory(libproxy)
+ add_subdirectory(bindings)
+-add_subdirectory(utils)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/librsvg-01-python.diff	Mon Aug 09 20:32:30 2010 +0000
@@ -0,0 +1,8 @@
+--- librsvg-2.26.3/rsvg.in-orig	2010-07-21 21:51:14.054571104 -0500
++++ librsvg-2.26.3/rsvg.in	2010-07-21 21:51:20.927630055 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ 
+ #
+ # This python script subsumes the old 'rsvg' C-based command-line program.
--- a/patches/librsvg-01-sgml.diff	Mon Aug 09 20:25:41 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -ruN librsvg-2.26.0.orig/doc/rsvg-docs.sgml librsvg-2.26.0/doc/rsvg-docs.sgml
---- librsvg-2.26.0.orig/doc/rsvg-docs.sgml	2010-01-04 22:02:50.468363918 +0000
-+++ librsvg-2.26.0/doc/rsvg-docs.sgml	2010-01-04 22:03:28.734508102 +0000
-@@ -3,7 +3,6 @@
-                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!NOTATION PNG SYSTEM "PNG">
- <!ENTITY hash "#">
--<!ENTITY % local.notation.class "| PNG">
- <!ENTITY RSVG SYSTEM "xml/rsvg.xml">
- <!ENTITY Cairo SYSTEM "xml/rsvg-cairo.xml">
- <!ENTITY GdkPixbuf SYSTEM "xml/rsvg-file-util.xml">
-diff -ruN librsvg-2.26.0.orig/doc/Makefile.am librsvg-2.26.0/doc/Makefile.am
---- librsvg-2.26.0.orig/doc/Makefile.am	2010-01-04 22:08:21.953984762 +0000
-+++ librsvg-2.26.0/doc/Makefile.am	2010-01-04 22:08:48.004437260 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS= --sgml-mode --output-format=xml
- 
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS=
-+FIXXREF_OPTIONS=--module=$(DOC_MODULE)
- 
- # Used for dependencies
- HFILE_GLOB=$(top_srcdir)/*.h
--- a/patches/librsvg-02-python.diff	Mon Aug 09 20:25:41 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
---- librsvg-2.26.3/rsvg.in-orig	2010-07-21 21:51:14.054571104 -0500
-+++ librsvg-2.26.3/rsvg.in	2010-07-21 21:51:20.927630055 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2.6
- 
- #
- # This python script subsumes the old 'rsvg' C-based command-line program.
--- a/specs/SUNWavant.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWavant.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -221,7 +221,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 # endif for "ifnarch sparc"
--- a/specs/SUNWbluefish.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWbluefish.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -126,7 +126,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWccsm.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWccsm.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -113,7 +113,9 @@
 %files l10n
 %defattr (-, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/locale/*
+%dir %attr (0755, root, other) %{_datadir}/applications
+%dir %attr (0755, root, other) %{_datadir}/*/*/
+/usr/share/locale/*/LC_MESSAGES/*.mo
 %endif
 
 # endif for "ifnarch sparc"
--- a/specs/SUNWcheese.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWcheese.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -192,7 +192,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/cheese/[a-z]*
 %{_datadir}/omf/cheese/cheese-[a-z]*.omf
--- a/specs/SUNWcodeina.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWcodeina.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -154,7 +154,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 #FIXME: %dir %attr (0755, root, other) %{_datadir}/gnome
 #FIXME: %{_datadir}/gnome/help/*/[a-z]*
 #FIXME: %{_datadir}/omf/*/*-[a-z][a-z].omf
--- a/specs/SUNWcompiz-fusion-extra.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWcompiz-fusion-extra.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -157,7 +157,9 @@
 %files l10n
 %defattr (-, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/locale
+%dir %attr (0755, root, bin) %{_datadir}/locale/
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
+%{_datadir}/locale/*/LC_MESSAGES/*.copyright
 %endif
 
 # endif for "ifnarch sparc"
--- a/specs/SUNWcompiz-fusion-main.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWcompiz-fusion-main.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -152,7 +152,9 @@
 %files l10n
 %defattr (-, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/locale
+%dir %attr (0755, root, bin) %{_datadir}/locale/
+%{_datadir}/locale/*/LC_MESSAGES/*.copyright
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
 %endif
 
 # endif for "ifnarch sparc"
--- a/specs/SUNWcontact-lookup-applet.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWcontact-lookup-applet.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -104,7 +104,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWevolution-data-server.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWevolution-data-server.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -170,7 +170,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWgir-repository.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgir-repository.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gir-repository
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -104,6 +104,10 @@
 rm $RPM_BUILD_ROOT/%{_libdir}/girepository-1.0/GConf-2.0.typelib
 rm $RPM_BUILD_ROOT/%{_datadir}/gir-1.0/GConf-2.0.gir
 
+# delivered by libsoup
+rm $RPM_BUILD_ROOT/usr/lib/girepository-1.0/Soup-2.4.typelib
+rm $RPM_BUILD_ROOT/usr/share/gir-1.0/Soup-2.4.gir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -117,6 +121,7 @@
 %doc(bzip2) -d gir-repository-%{version} COPYING
 %dir %attr (0755, root, other) %{_datadir}/doc
 
+
 %changelog
 * Thu Apr 22 2010 - [email protected]
 - Fix %files.
--- a/specs/SUNWgnome-a11y-libs.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgnome-a11y-libs.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -282,7 +282,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %files python26
--- a/specs/SUNWgnome-commander.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgnome-commander.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -121,10 +121,9 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/gnome-commander/[a-z]*
-%{_datadir}/omf/gnome-commander/*-[a-z]*.omf
 %endif
 
 %changelog
--- a/specs/SUNWgnome-display-mgr.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgnome-display-mgr.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gdm
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -219,7 +219,7 @@
 # it has to be /var/svc even if this package has its %_localstatedir
 # redefined.
 %dir %attr (0755, root, sys) /var
-%dir %attr (0755, root, sys) /var/log
+%dir %attr (0755, root, bin) /var/log
 %dir %attr (1770, root, gdm) /var/log/gdm
 # SVC method file
 %dir %attr (0755, root, bin) /lib
@@ -243,7 +243,7 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/gnome
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %{_datadir}/gnome/*help/*/[a-z]*
 %{_datadir}/omf/gdm/*-[a-z]*.omf
 %endif
--- a/specs/SUNWgnome-media-apps.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgnome-media-apps.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gnome-media
 #
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -258,7 +258,7 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/gnome
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %{_datadir}/gnome/help/*/[a-z]*
 %{_datadir}/omf/*/*-[a-z][a-z].omf
 %{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf
--- a/specs/SUNWgnome-media.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgnome-media.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gst, gst-plugins-base, gst-plugins-good
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -381,7 +381,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWgnome-pilot.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgnome-pilot.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -153,7 +153,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %files devel
--- a/specs/SUNWgtk-vnc.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWgtk-vnc.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): gtk-vnc
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -217,7 +217,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWjokosher.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWjokosher.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -149,7 +149,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %endif
 
--- a/specs/SUNWlibgoffice.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWlibgoffice.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): goffice
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -125,7 +125,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWlibgsf.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWlibgsf.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -185,7 +185,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWlibgweather.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWlibgweather.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -100,8 +100,9 @@
 
 %if %build_l10n
 %files l10n
+%defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 
--- a/specs/SUNWmoovida-plugins.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWmoovida-plugins.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes modules: moovida-plugins-good, moovida-plugins-bad
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -130,7 +130,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 # endif for "ifnarch sparc"
--- a/specs/SUNWnwam-manager.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWnwam-manager.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -142,10 +142,8 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %dir %attr (0755, root, other) %{_datadir}/gnome
-#%{_datadir}/gnome/help/*/[a-z]*
-#%{_datadir}/omf/*/*-[a-z][a-z].omf
 %endif
 
 %changelog
--- a/specs/SUNWobby.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWobby.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -112,7 +112,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWplanner.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWplanner.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -201,7 +201,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/*/[a-z]*
 %{_datadir}/omf/*/*-[a-z]*.omf
--- a/specs/SUNWpython-notify.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWpython-notify.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -71,14 +71,16 @@
 %dir %attr (0755, root, other) %{_datadir}/doc
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/python%{pythonver}/vendor-packages/gtk-2.0/pynotify
 %dir %attr (0755, root, sys) %{_datadir}
+/usr/lib/python2.6/vendor-packages/gtk-2.0/pynotify/__init__.pyc
+/usr/lib/python2.6/vendor-packages/gtk-2.0/pynotify/__init__.py
+/usr/lib/python2.6/vendor-packages/gtk-2.0/pynotify/_pynotify.so
 
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
-%dir %attr (0755, root, other) %{_libdir}/python2.4/pkgconfig
-%{_libdir}/python%{pythonver}/pkgconfig/*
+%{_libdir}/python2.4/notify-python.pc
+
 
 %changelog
 * Thu Feb 12 2009 - [email protected]
--- a/specs/SUNWseahorse-plugins.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWseahorse-plugins.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -138,7 +138,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %{_datadir}/omf/*/*-[a-z][a-z].omf
 %{_datadir}/omf/*/*-[a-z][a-z]_[A-Z][A-Z].omf
 %dir %attr (0755, root, other) %{_datadir}/gnome
--- a/specs/SUNWtgnome-tsoljdsdevmgr.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWtgnome-tsoljdsdevmgr.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -87,15 +87,14 @@
 %files
 %defattr (-, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr(0755, root, other) %{_datadir}/locale
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/tsoljdsdevmgr
 
 %if %build_l10n
 %files l10n
-%defattr (-, root, other)
+%defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr(0755, root, bin) %{_datadir}/locale/
+%dir %attr(0755, root, bin) %{_datadir}/locale/*/
 %{_datadir}/locale/*/LC_MESSAGES/*.copyright
 %{_datadir}/locale/*/LC_MESSAGES/*.mo
 %endif
--- a/specs/SUNWtgnome-tstripe.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWtgnome-tstripe.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -92,7 +92,9 @@
 %files l10n
 %defattr (-, root, other)
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/locale
+%dir %attr (0755, root, bin) %{_datadir}/locale/
+%{_datadir}/locale/*/LC_MESSAGES/*.copyright
+%{_datadir}/locale/*/LC_MESSAGES/*.mo
 %endif
 
 %changelog
--- a/specs/SUNWtransmission.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWtransmission.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -148,7 +148,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWtsclient.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWtsclient.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): tsclient
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -138,7 +138,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog
--- a/specs/SUNWvinagre.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWvinagre.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): vinagre
 #
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -162,7 +162,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %{_datadir}/omf/vinagre/vinagre-[a-z][a-z].omf
 %{_datadir}/omf/vinagre/vinagre-[a-z][a-z]_[A-Z][A-Z].omf
 %dir %attr (0755, root, other) %{_datadir}/gnome
--- a/specs/SUNWvirt-manager.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWvirt-manager.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -135,7 +135,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 # endif for "ifnarch sparc"
--- a/specs/SUNWxchat.spec	Mon Aug 09 20:25:41 2010 +0000
+++ b/specs/SUNWxchat.spec	Mon Aug 09 20:32:30 2010 +0000
@@ -89,7 +89,7 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%attr (-, root, other) %{_datadir}/locale/*/
 %endif
 
 %changelog