Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit gnome-mount
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 02 Aug 2007 17:16:28 +0200
  • Message-id: <20070802151629.005F2678332@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package gnome-mount
checked in at Thu Aug 2 17:16:28 CEST 2007.

--------
--- GNOME/gnome-mount/gnome-mount.changes       2007-07-24 15:38:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-mount/gnome-mount.changes        2007-08-01 02:25:28.959256000 +0200
@@ -1,0 +2,10 @@
+Wed Aug  1 02:00:24 CEST 2007 - jpr@xxxxxxx
+
+- Update to 0.6
+- Default to shortname=lower for vfat (BGO #390201)
+- Better handling of NTFS (BGO #394947)
+- Get rid of libgnomeui dependency
+- Reduce build requires
+- Remove upstreamed patch
+
+-------------------------------------------------------------------

Old:
----
  gnome-mount-0.5.tar.bz2
  gnome-mount-warn.patch

New:
----
  gnome-mount-0.6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-mount.spec ++++++
--- /var/tmp/diff_new_pack.U24051/_old  2007-08-02 17:13:26.000000000 +0200
+++ /var/tmp/diff_new_pack.U24051/_new  2007-08-02 17:13:26.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-mount (Version 0.5)
+# spec file for package gnome-mount (Version 0.6)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,9 +11,9 @@
 # norootforbuild
 
 Name:           gnome-mount
-BuildRequires:  eel-devel intltool libglade2-devel libnotify-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files
-Version:        0.5
-Release:        61
+BuildRequires:  eel-devel intltool libglade2-devel libnotify-devel nautilus-devel perl-XML-Parser update-desktop-files
+Version:        0.6
+Release:        1
 Url:            http://www.gnome.org/
 Group:          System/GUI/GNOME
 License:        GPL v2 or later
@@ -21,7 +21,6 @@
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
 Patch:          gnome-mount-old-hal.patch
 Patch1:         gnome-mount-hal-version.patch
-Patch2:         gnome-mount-warn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       %{name}-devel = %{version}-%{release}
 
@@ -52,7 +51,6 @@
 %else
 %patch1
 %endif
-%patch2
 
 %build
 autoreconf -f -i
@@ -87,6 +85,13 @@
 %doc %{_mandir}/man1/gnome-mount*.*
 
 %changelog
+* Wed Aug 01 2007 - jpr@xxxxxxx
+- Update to 0.6
+- Default to shortname=lower for vfat (BGO #390201)
+- Better handling of NTFS (BGO #394947)
+- Get rid of libgnomeui dependency
+- Reduce build requires
+- Remove upstreamed patch
 * Tue Jul 24 2007 - sbrabec@xxxxxxx
 - Accept hal-storage version 0.5.8_git200704021230 in factory.
 * Thu Jul 19 2007 - sbrabec@xxxxxxx

++++++ gnome-mount-0.5.tar.bz2 -> gnome-mount-0.6.tar.bz2 ++++++
++++ 30543 lines of diff (skipped)

++++++ gnome-mount-hal-version.patch ++++++
--- /var/tmp/diff_new_pack.U24051/_old  2007-08-02 17:13:27.000000000 +0200
+++ /var/tmp/diff_new_pack.U24051/_new  2007-08-02 17:13:27.000000000 +0200
@@ -4,8 +4,8 @@
  fi
  AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test "x$enable_nautilus_extension" = "xyes")
  
--PKG_CHECK_MODULES(GNOME_MOUNT, gnome-keyring-1 >= 0.4 libgnomeui-2.0 >= 2.1.5 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8.1 gtk+-2.0 >= 2.8.0)
-+PKG_CHECK_MODULES(GNOME_MOUNT, gnome-keyring-1 >= 0.4 libgnomeui-2.0 >= 2.1.5 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8 gtk+-2.0 >= 2.8.0)
+-PKG_CHECK_MODULES(GNOME_MOUNT, gconf-2.0 gnome-keyring-1 >= 0.4 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8.1 gtk+-2.0 >= 2.8.0)
++PKG_CHECK_MODULES(GNOME_MOUNT, gconf-2.0 gnome-keyring-1 >= 0.4 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8 gtk+-2.0 >= 2.8.0)
  AC_SUBST(GNOME_MOUNT_CFLAGS)
  AC_SUBST(GNOME_MOUNT_LIBS)
  

++++++ gnome-mount-old-hal.patch ++++++
--- /var/tmp/diff_new_pack.U24051/_old  2007-08-02 17:13:27.000000000 +0200
+++ /var/tmp/diff_new_pack.U24051/_new  2007-08-02 17:13:27.000000000 +0200
@@ -4,8 +4,8 @@
  fi
  AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test "x$enable_nautilus_extension" = "xyes")
  
--PKG_CHECK_MODULES(GNOME_MOUNT, gnome-keyring-1 >= 0.4 libgnomeui-2.0 >= 2.1.5 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8.1 gtk+-2.0 >= 2.8.0)
-+PKG_CHECK_MODULES(GNOME_MOUNT, gnome-keyring-1 >= 0.4 libgnomeui-2.0 >= 2.1.5 dbus-glib-1 >= 0.31 hal-storage >= 0.5.6 gtk+-2.0 >= 2.8.0)
+-PKG_CHECK_MODULES(GNOME_MOUNT, gconf-2.0 gnome-keyring-1 >= 0.4 dbus-glib-1 >= 0.31 hal-storage >= 0.5.8.1 gtk+-2.0 >= 2.8.0)
++PKG_CHECK_MODULES(GNOME_MOUNT, gconf-2.0 gnome-keyring-1 >= 0.4 dbus-glib-1 >= 0.31 hal-storage >= 0.5.6 gtk+-2.0 >= 2.8.0)
  AC_SUBST(GNOME_MOUNT_CFLAGS)
  AC_SUBST(GNOME_MOUNT_LIBS)
  
@@ -15,45 +15,9 @@
     AC_SUBST(GNOME_MOUNT_PROPERTIES_CFLAGS)
     AC_SUBST(GNOME_MOUNT_PROPERTIES_LIBS)
  
---- src/gnome-mount-properties-view.c
-+++ src/gnome-mount-properties-view.c
-@@ -584,33 +584,6 @@
-                               else
-                                       media = _("DVD+R Dual Layer Disc");
-                               break;
--                      case LIBHAL_VOLUME_DISC_TYPE_BDR:
--                              if (libhal_volume_disc_is_blank (vol))
--                                      media = _("Blank BD-R Disc");
--                              else
--                                      media = _("BD-R Disc");
--                              break;
--                      case LIBHAL_VOLUME_DISC_TYPE_BDRE:
--                              if (libhal_volume_disc_is_blank (vol))
--                                      media = _("Blank BD-RE Disc");
--                              else
--                                      media = _("BD-RE Disc");
--                              break;
--                      case LIBHAL_VOLUME_DISC_TYPE_HDDVDROM:
--                              media = _("HD DVD-ROM Disc");
--                              break;
--                      case LIBHAL_VOLUME_DISC_TYPE_HDDVDR:
--                              if (libhal_volume_disc_is_blank (vol))
--                                      media = _("Blank HD DVD-R Disc");
--                              else
--                                      media = _("HD DVD-R Disc");
--                              break;
--                      case LIBHAL_VOLUME_DISC_TYPE_HDDVDRW:
--                              if (libhal_volume_disc_is_blank (vol))
--                                      media = _("Blank HD DVD-RW Disc");
--                              else
--                                      media = _("HD DVD-RW Disc");
--                              break;
-                       }
-               
-                       /* Special case for pure audio disc */
 --- src/gnome-mount.c
 +++ src/gnome-mount.c
-@@ -1519,38 +1519,25 @@
+@@ -1560,38 +1560,25 @@
        char *vendor;
        char *drive_name;
        DBusPendingCall *pending_return;
@@ -92,7 +56,7 @@
        }
  
        if (vendor != NULL && model != NULL)
-@@ -1654,9 +1641,7 @@
+@@ -1695,9 +1682,7 @@
         * So put up a dialog after some time that tells the user we're flushing
         * the cache.
         */
@@ -103,7 +67,7 @@
  
        /* it also means we can't use dbus_connection_send_with_reply_and_block() as
         * that function doesn't enter the mainloop
-@@ -1681,9 +1666,7 @@
+@@ -1722,9 +1707,7 @@
  
        dbus_error_init (&error);
        if (dbus_set_error_from_message (&error, reply)) {
@@ -114,7 +78,7 @@
                g_warning ("Unmount failed for %s: %s : %s\n", udi, error.name, error.message);
                show_error_dialog_unmount (udi, volume, drive, error.name, error.message);
                dbus_error_free (&error);
-@@ -1691,9 +1674,7 @@
+@@ -1732,9 +1715,7 @@
        }
  
        g_print (_("Unmounted %s\n"), get_dev_file (volume, drive));
@@ -125,7 +89,7 @@
  
        ret = TRUE;
  out:
-@@ -1723,39 +1704,26 @@
+@@ -1764,39 +1745,26 @@
        char *model;
        char *vendor;
        char *drive_name;
@@ -165,7 +129,7 @@
        }
  
        if (vendor != NULL && model != NULL)
-@@ -1858,9 +1826,7 @@
+@@ -1899,9 +1867,7 @@
         * So put up a dialog after some time that tells the user we're flushing
         * the cache.
         */
@@ -176,7 +140,7 @@
  
        /* it also means we can't use dbus_connection_send_with_reply_and_block() as
         * that function doesn't enter the mainloop
-@@ -1885,9 +1851,7 @@
+@@ -1926,9 +1892,7 @@
  
        dbus_error_init (&error);
        if (dbus_set_error_from_message (&error, reply)) {
@@ -187,7 +151,7 @@
                g_warning ("Eject failed for %s: %s : %s\n", udi, error.name, error.message);
                show_error_dialog_eject (udi, volume, drive, error.name, error.message);
                dbus_error_free (&error);
-@@ -1895,9 +1859,7 @@
+@@ -1936,9 +1900,7 @@
        }
  
        g_print (_("Ejected %s\n"), get_dev_file (volume, drive));
@@ -198,7 +162,7 @@
  
        ret = TRUE;
  
-@@ -2116,192 +2078,6 @@
+@@ -2157,192 +2119,6 @@
        return result;
  }
  
@@ -391,7 +355,7 @@
  static void 
  my_empty_log_handler (const gchar *log_domain,
                      GLogLevelFlags log_level,
-@@ -2535,8 +2311,6 @@
+@@ -2576,8 +2352,6 @@
        LibHalVolume *volume = NULL;
        const char *udi;
        char *resolved_device_file = NULL;
@@ -400,7 +364,7 @@
        static gboolean opt_verbose = FALSE;
        static gboolean opt_unmount = FALSE;
        static gboolean opt_eject = FALSE;
-@@ -2558,8 +2332,6 @@
+@@ -2599,8 +2373,6 @@
                          { "no-ui", 'n', 0, G_OPTION_ARG_NONE, &opt_noui, "Don't show any dialogs", NULL},
                          { "block", 'b', 0, G_OPTION_ARG_NONE, &opt_block, "Allow gnome-mount to block for UI", NULL},
                          { "unmount", 'u', 0, G_OPTION_ARG_NONE, &opt_unmount, "Unmount", NULL},
@@ -409,7 +373,7 @@
                          { "eject", 'e', 0, G_OPTION_ARG_NONE, &opt_eject, "Eject", NULL},
                          { "hal-udi", 'h', 0, G_OPTION_ARG_STRING, &opt_hal_udi, "Mount by HAL UDI", NULL},
                          { "device", 'd', 0, G_OPTION_ARG_STRING, &opt_device_file, "Mount by device file", NULL},
-@@ -2592,10 +2364,6 @@
+@@ -2633,10 +2405,6 @@
        extra_mount_options_from_command_line = g_strdup (opt_extra_mount_options);
        fstype_from_command_line = g_strdup (opt_fstype);
  
@@ -420,7 +384,7 @@
        /* these options are only meaningful from the commandline */
        if (opt_display_settings ||
            opt_write_settings ||
-@@ -2818,27 +2586,12 @@
+@@ -2857,27 +2625,12 @@
                        fsusage = LIBHAL_VOLUME_USAGE_UNKNOWN;
                }
  
@@ -449,7 +413,7 @@
                                }
                        }
                }
-@@ -2855,70 +2608,7 @@
+@@ -2894,70 +2647,7 @@
                        fsusage = LIBHAL_VOLUME_USAGE_UNKNOWN;
                }
  


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread