Hello community, here is the log from the commit of package unetbootin for openSUSE:Factory checked in at 2015-01-20 12:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unetbootin (Old) and /work/SRC/openSUSE:Factory/.unetbootin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unetbootin" Changes: -------- --- /work/SRC/openSUSE:Factory/unetbootin/unetbootin.changes 2015-01-08 23:01:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unetbootin.new/unetbootin.changes 2015-01-20 12:38:51.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Jan 15 21:14:54 UTC 2015 - [email protected] + +- slightly clean up unetbootin-locate-usb-devices.diff patch + +------------------------------------------------------------------- +Thu Dec 11 22:21:30 UTC 2014 - [email protected] + +- locate usb drives via /dev/disk/py-path in order to workaround + udev issues + +------------------------------------------------------------------- New: ---- unetbootin-locate-usb-devices.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unetbootin.spec ++++++ --- /var/tmp/diff_new_pack.QpSuZt/_old 2015-01-20 12:38:53.000000000 +0100 +++ /var/tmp/diff_new_pack.QpSuZt/_new 2015-01-20 12:38:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package unetbootin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,7 @@ Source: %{name}-source-%{rev}.tar.gz Source1: %{name}.desktop Patch0: %{name}-suse.patch +Patch1: %{name}-locate-usb-devices.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -50,7 +51,8 @@ %prep %setup -q -c -n %{name} -%patch0 +%patch0 -p1 +%patch1 -p1 # rpmlint: wrong-file-end-of-line-encoding sed -i 's/\r$//' README.TXT ++++++ unetbootin-locate-usb-devices.diff ++++++ Index: b/unetbootin.cpp =================================================================== --- a/unetbootin.cpp +++ b/unetbootin.cpp @@ -575,17 +575,12 @@ QStringList unetbootin::listsanedrives() } #endif #ifdef Q_OS_LINUX - QDir devlstdir("/dev/disk/by-id/"); + QDir devlstdir("/dev/disk/by-path/"); QFileInfoList usbfileinfoL = devlstdir.entryInfoList(QDir::NoDotAndDotDot|QDir::Files); for (int i = 0; i < usbfileinfoL.size(); ++i) { -// if (usbfileinfoL.at(i).contains(QRegExp("^usb-\\S{1,}-part\\d{1,}$"))) -// { -// fulldrivelist.append(usbfileinfoL.at(i).canonicalFilePath()); -// } - if (usbfileinfoL.at(i).fileName().contains(QRegExp("^usb-\\S{1,}$")) || - usbfileinfoL.at(i).fileName().contains(QRegExp("^mmc-\\S{1,}$"))) - { + if (usbfileinfoL.at(i).fileName().contains(QRegExp("-usb-"))) + { if (!volidcommand.isEmpty()) { if (QString(callexternapp(volidcommand, QString("-t %2").arg(usbfileinfoL.at(i).canonicalFilePath()))).contains(QRegExp("(vfat|ext2|ext3|ext4)"))) @@ -602,20 +597,7 @@ QStringList unetbootin::listsanedrives() } } } - /* - QString fdisklusbdevsS = callexternapp(fdiskcommand, "-l"); - QStringList usbdevsL = QString(fdisklusbdevsS).split("\n").filter(QRegExp("\\.{0,}FAT|Disk\\.{0,}")).join("\n").split(" ").join("\n").split("\t").join("\n").split("\n").filter("/dev/"); - for (int i = 0; i < usbdevsL.size(); ++i) - { - if (usbdevsL.at(i).contains(":")) - { - if (!QString(callexternapp(volidcommand, QString("-t %2").arg(QString(usbdevsL.at(i)).remove(":")))).contains("vfat")) - continue; - } - fulldrivelist.append(QString(usbdevsL.at(i)).remove(":")); - } - */ - #endif + #endif #ifdef Q_OS_MAC QString diskutilList = callexternapp("diskutil", "list"); QStringList usbdevsL = diskutilList.split("\n").filter(QRegExp("(FAT|Microsoft)")).join(" ").split(" ").filter("disk"); ++++++ unetbootin-suse.patch ++++++ --- /var/tmp/diff_new_pack.QpSuZt/_old 2015-01-20 12:38:53.000000000 +0100 +++ /var/tmp/diff_new_pack.QpSuZt/_new 2015-01-20 12:38:53.000000000 +0100 @@ -1,8 +1,8 @@ -Index: distrover.cpp +Index: b/distrover.cpp =================================================================== ---- distrover.cpp.orig -+++ distrover.cpp -@@ -174,11 +174,11 @@ unetbootin::tr("<b>Homepage:</b> <a href +--- a/distrover.cpp ++++ b/distrover.cpp +@@ -176,11 +176,11 @@ unetbootin::tr("<b>Homepage:</b> <a href "<b>Description:</b> The Offline NT Password and Registry Editor can reset Windows passwords and edit the registry on Windows 2000-Vista.<br/>" "<b>Install Notes:</b> NTPasswd is booted and run in live mode; no installation is required to use it.") << "2008.05.26" << "2011.05.11")); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
