Irene,

You patch is hard to read. Please attach the original patch instead of
patch of patch.

Thanks,
Harry

Irene (Shi Ying) Huang :
> Hi, Please review the attached patch for bugster bug 6557943
>
> --Irene
>
>   
> ------------------------------------------------------------------------
>
> Index: ChangeLog
> ===================================================================
> --- ChangeLog (revision 11502)
> +++ ChangeLog (working copy)
> @@ -1,3 +1,9 @@
> +2007-06-12  Irene Huang  <irene.huang at sun.com>
> +
> +     * base-specs/nautilus-cd-burner.spec: add patch 03-eject.diff
> +     for bug 6557943
> +     * patches/nautilus-cd-burner-03-eject.diff: New Patch
> +
>  2007-06-11  Damien Carbery <damien.carbery at sun.com>
>  
>       * base-specs/metacity.spec: Bump to 2.19.13. Bump to 2.19.13. Add
> Index: base-specs/nautilus-cd-burner.spec
> ===================================================================
> --- base-specs/nautilus-cd-burner.spec        (revision 11502)
> +++ base-specs/nautilus-cd-burner.spec        (working copy)
> @@ -20,6 +20,8 @@
>  Patch1:            nautilus-cd-burner-01-always-use-cdrecord-on-solaris.diff
>  #owner:sh162551 date:2007-04-29 type:branding bugster:6551016
>  Patch2:            nautilus-cd-burner-02-non-raw-device.diff
> +#owner:sh162551 date:2007-06-12 type:bug bugzilla:439023 bugster:6557943
> +Patch3:       nautilus-cd-burner-03-eject.diff
>  URL:          http://www.gnome.org
>  BuildRoot:    %{_tmppath}/%{name}-%{version}-build
>  Docdir:       %{_defaultdocdir}/doc
> @@ -51,6 +53,7 @@
>  %setup -q
>  %patch1 -p1
>  %patch2 -p1
> +%patch3 -p1
>  
>  for po in po/*.po; do
>    dos2unix -ascii $po $po
> @@ -120,6 +123,8 @@
>  %{_libdir}/pkgconfig/libnautilus-burn.pc
>  
>  %changelog
> +* Tue Jun 12 2007 - irene.huang at sun.com
> +- add patch -03-eject.diff.
>  * Mon May 14 2007 - irene.huang at sun.com
>  - Change Patch 2 to be branding
>  * Thu May 10 2007 - damien.carbery at sun.com
> Index: patches/nautilus-cd-burner-03-eject.diff
> ===================================================================
> --- patches/nautilus-cd-burner-03-eject.diff  (revision 0)
> +++ patches/nautilus-cd-burner-03-eject.diff  (revision 0)
> @@ -0,0 +1,23 @@
> +--- nautilus-cd-burner-2.19.1/src/nautilus-burn-drive.c.orig 2007-06-11 
> 22:20:19.733093000 +0800
> ++++ nautilus-cd-burner-2.19.1/src/nautilus-burn-drive.c      2007-06-11 
> 22:30:51.074215000 +0800
> +@@ -799,6 +799,12 @@
> + 
> +     g_return_val_if_fail (drive != NULL, FALSE);
> + 
> ++#if defined(sun) && defined(__SVR4)
> ++    if (drive->priv->media_udi == NULL) 
> ++            return FALSE;
> ++    cmd = g_strdup_printf ("gnome-mount --block --eject --no-ui 
> --hal-udi=%s", drive->priv->media_udi);
> ++#else
> ++
> +     if (drive->priv->device == NULL) {
> +             return FALSE;
> +     }
> +@@ -808,6 +814,7 @@
> + #else
> +     cmd = g_strdup_printf ("eject %s", drive->priv->device);
> + #endif
> ++#endif
> + 
> +     res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
> +     g_free (cmd);
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: 
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20070612/9c09dc7f/attachment.html>

Reply via email to