Hello community,
here is the log from the commit of package unetbootin for openSUSE:Factory checked in at 2016-07-01 09:59:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-09 22:35:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.unetbootin.new/unetbootin.changes 2016-07-01 10:00:00.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Jun 28 17:05:35 UTC 2016 - chris@computersalat.de
+
+- rebase patches
+- fix changelog
+
+-------------------------------------------------------------------
+Wed Jun 22 10:55:16 UTC 2016 - ecsos@opensuse.org
+
+- change selectable openSUSE versions only to supported versions:
+ 13.1, 13.2, Leap_42.1, Tumbleweed, Factory
+- change my old email to the new one in previous changes
+
+-------------------------------------------------------------------
+Mon Jun 20 08:37:19 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- update to revision 625
+
+-------------------------------------------------------------------
@@ -33 +51 @@
-Sun Sep 7 09:44:14 UTC 2014 - ecsos@schirra.net
+Sun Sep 7 09:44:14 UTC 2014 - ecsos@opensuse.org
@@ -35 +53 @@
-- update to 6.0.8
+- update to 608
@@ -38 +56 @@
-Mon May 5 15:25:53 UTC 2014 - ecsos@schirra.net
+Mon May 5 15:25:53 UTC 2014 - ecsos@opensuse.org
@@ -40 +58 @@
-- update to 6.0.3
+- update to 603
Old:
----
unetbootin-source-613.tar.gz
New:
----
unetbootin-source-625.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unetbootin.spec ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package unetbootin
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
#
-%define rev 613
+%define rev 625
Name: unetbootin
Summary: Universal Netboot Installer
@@ -42,9 +42,6 @@
Requires: udev
Requires: util-linux
Requires: xdg-utils
-%if 0%{?suse_version} == 1230
-BuildRequires: libjpeg8-devel
-%endif
%description
UNetbootin allows for the installation of various Linux/BSD distributions
@@ -54,9 +51,9 @@
%prep
%setup -q -c -n %{name}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+%patch0
+%patch1
+%patch2
# rpmlint: wrong-file-end-of-line-encoding
sed -i 's/\r$//' README.TXT
++++++ unetbootin-desktop.patch ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,21 +1,23 @@
---- unetbootin.desktop.orig 2014-04-05 08:33:20.000000000 +0200
-+++ unetbootin.desktop 2015-08-10 10:13:50.725736800 +0200
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Version=1.0
- Name=UNetbootin
-+GenericName=UNetbootin
- Comment=Tool for creating Live USB drives
--Categories=Application;System;
--Exec=/usr/bin/unetbootin
--Terminal=false
- Type=Application
--Name[en_US]=UNetbootin
--GenericName[en_US]=UNetbootin
--Comment[en_US]=Tool for creating Live USB drives
-+Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin
-+Terminal=false
- Icon=unetbootin
-+Categories=System;Filesystem;
-+X-KDE-StartupNotify=true
-+X-SuSE-translate=true
+Index: unetbootin.desktop
+===================================================================
+--- unetbootin.desktop.orig
++++ unetbootin.desktop
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Version=1.0
+ Name=UNetbootin
++GenericName=UNetbootin
+ Comment=Tool for creating Live USB drives
+-Categories=Application;System;
+-Exec=/usr/bin/unetbootin
+-Terminal=false
+ Type=Application
+-Name[en_US]=UNetbootin
+-GenericName[en_US]=UNetbootin
+-Comment[en_US]=Tool for creating Live USB drives
++Exec=/usr/bin/xdg-su -c /usr/sbin/unetbootin
++Terminal=false
+ Icon=unetbootin
++Categories=System;Filesystem;
++X-KDE-StartupNotify=true
++X-SuSE-translate=true
++++++ unetbootin-locate-usb-devices.diff ++++++
--- /var/tmp/diff_new_pack.2N0BYG/_old 2016-07-01 10:00:01.000000000 +0200
+++ /var/tmp/diff_new_pack.2N0BYG/_new 2016-07-01 10:00:01.000000000 +0200
@@ -1,7 +1,7 @@
-Index: b/unetbootin.cpp
+Index: unetbootin.cpp
===================================================================
---- a/unetbootin.cpp
-+++ b/unetbootin.cpp
+--- unetbootin.cpp.orig
++++ unetbootin.cpp
@@ -575,17 +575,12 @@ QStringList unetbootin::listsanedrives()
}
#endif
++++++ unetbootin-source-613.tar.gz -> unetbootin-source-625.tar.gz ++++++
Files old/._distrolst.cpp and new/._distrolst.cpp differ
Files old/._distrover.cpp and new/._distrover.cpp differ
Files old/._main.cpp and new/._main.cpp differ
Files old/._org.unetbootin.pkexec.unetbootin.policy and new/._org.unetbootin.pkexec.unetbootin.policy differ
Files old/._unetbootin.cpp and new/._unetbootin.cpp differ
Files old/._unetbootin.h and new/._unetbootin.h differ
Files old/._unetbootin.ui and new/._unetbootin.ui differ
Files old/._unetbootin.xpm and new/._unetbootin.xpm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.TXT new/README.TXT
--- old/README.TXT 2015-07-20 10:43:12.000000000 +0200
+++ new/README.TXT 2016-05-16 11:24:20.000000000 +0200
@@ -1,16 +1,16 @@
-UNetbootin Source Revision 613
+UNetbootin Source Revision 625
Copyright Geza Kovacs
Homepage at http://unetbootin.sourceforge.net
Licensed under the GNU GPL v2 and above, components from other projects are licensed under their respective licenses
-Build generated on Mon Jul 20 01:43:12 PDT 2015
+Build generated on Mon May 16 02:24:20 PDT 2016
Download using git:
git clone https://github.com/gkovacs/unetbootin.git
cd unetbootin
-git checkout cbf30e41bbd2ad57f31feb29c559d6a2046f0d6c
+git checkout 807d69b20c2bd403ecd63ea4fe8cfbe5bb49ce33
Download using bzr:
-bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r613
+bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r625
Build instructions at http://sourceforge.net/apps/trac/unetbootin/wiki/compile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrolst.cpp new/distrolst.cpp
--- old/distrolst.cpp 2015-07-20 03:05:56.000000000 +0200
+++ new/distrolst.cpp 2016-05-16 11:16:09.000000000 +0200
@@ -11,13 +11,15 @@
#define debianrelnamereplace \
relname \
.replace("unstable", "sid") \
- .replace("testing", "jessie") \
- .replace("stable", "wheezy");
+ .replace("testing", "stretch") \
+ .replace("stable", "jessie");
#endif
#ifndef ubunturelnamereplace
#define ubunturelnamereplace \
relname \
+ .replace("16.10", "yakkety") \
+ .replace("16.04", "xenial") \
.replace("15.10", "wily") \
.replace("15.04", "vivid") \
.replace("14.10", "utopic") \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distrover.cpp new/distrover.cpp
--- old/distrover.cpp 2015-07-20 02:57:22.000000000 +0200
+++ new/distrover.cpp 2016-05-16 11:18:44.000000000 +0200
@@ -11,8 +11,8 @@
#define ubuntuverlist \
"12.04_NetInstall" << "12.04_NetInstall_x64" << "12.04_HdMedia" << "12.04_HdMedia_x64" << "12.04_Live" << "12.04_Live_x64" << \
"14.04_NetInstall" << "14.04_NetInstall_x64" << "14.04_HdMedia" << "14.04_HdMedia_x64" << "14.04_Live" << "14.04_Live_x64" << \
-"14.10_NetInstall" << "14.10_NetInstall_x64" << "14.10_HdMedia" << "14.10_HdMedia_x64" << "14.10_Live" << "14.10_Live_x64" << \
-"15.04_NetInstall" << "15.04_NetInstall_x64" << "15.04_HdMedia" << "15.04_HdMedia_x64" << "15.04_Live" << "15.04_Live_x64" << \
+"15.10_NetInstall" << "15.10_NetInstall_x64" << "15.10_HdMedia" << "15.10_HdMedia_x64" << "15.10_Live" << "15.10_Live_x64" << \
+"16.04_NetInstall" << "16.04_NetInstall_x64" << "16.04_HdMedia" << "16.04_HdMedia_x64" << "16.04_Live" << "16.04_Live_x64" << \
"Daily_Live" << "Daily_Live_x64"
#endif
@@ -125,7 +125,7 @@
"<b>Description:</b> Kaspersky Rescue Disk detects and removes malware from your Windows installation.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which malware scans can be launched.") <<
"10_Live" << "8_Live"));
- distroselect->addItem("Kubuntu", (QStringList() << "14.04_Live" <<
+ distroselect->addItem("Kubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> http://www.kubuntu.org/\">http://www.kubuntu.org</a><br/>"
"<b>Description:</b> Kubuntu is an official Ubuntu derivative featuring the KDE desktop.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<
@@ -140,7 +140,7 @@
"<b>Description:</b> Linux Mint is a user-friendly Ubuntu-based distribution which includes additional proprietary codecs and other software by default.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched.") <<
"17_Live" << "17_Live_x64" << "17.1_Live" << "17.1_Live_x64" << "17.2_Live" << "17.2_Live_x64"));
-distroselect->addItem("Lubuntu", (QStringList() << "14.04_Live" <<
+distroselect->addItem("Lubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> http://www.lubuntu.net/\">http://www.lubuntu.net</a><br/>"
"<b>Description:</b> Lubuntu is an official Ubuntu derivative featuring the LXDE desktop.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<
@@ -247,7 +247,7 @@
// "<b>Description:</b> SystemRescueCD includes various partition management and data recovery and backup tools.<br/>"
// "<b>Install Notes:</b> SystemRescueCD is booted and run in live mode; no installation is required to use it.") <<
//"Latest_Live"));
-distroselect->addItem("Ubuntu", (QStringList() << "14.04_Live" <<
+distroselect->addItem("Ubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> http://www.ubuntu.com/\">http://www.ubuntu.com</a><br/>"
"<b>Description:</b> Ubuntu is a user-friendly Debian-based distribution. It is currently the most popular Linux desktop distribution.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<
@@ -257,7 +257,7 @@
"<b>Description:</b> xPUD is a lightweight distribution featuring a simple kiosk-like interface with a web browser and media player.<br/>"
"<b>Install Notes:</b> The Live version loads the entire system into RAM and boots from memory.") <<
"Stable_Live" << "Unstable_Live"));
-distroselect->addItem("Xubuntu", (QStringList() << "14.04_Live" <<
+distroselect->addItem("Xubuntu", (QStringList() << "16.04_Live" <<
unetbootin::tr("<b>Homepage:</b> http://www.xubuntu.org/\">http://www.xubuntu.org</a><br/>"
"<b>Description:</b> Xubuntu is an official Ubuntu derivative featuring the XFCE desktop.<br/>"
"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/main.cpp new/main.cpp
--- old/main.cpp 2014-04-22 01:20:27.000000000 +0200
+++ new/main.cpp 2016-05-16 10:57:42.000000000 +0200
@@ -293,35 +293,55 @@
argsconc += "\"rootcheck=no\"";
argsconcSingleQuote += "'rootcheck=no'";
#ifdef Q_OS_LINUX
- QString gksulocation = checkforgraphicalsu("gksu");
+ QString gksuarg1;
+ gksuarg1 += QString("bash -c 'QT_X11_NO_MITSHM=1 ");
+ gksuarg1 += QString("%1 %2").arg(app.applicationFilePath()).arg(argsconc);
+ gksuarg1 += QString("'");
+ QStringList gksuargs;
+ gksuargs.append(gksuarg1);
+
+ /*
+ QString pkexeclocation = checkforgraphicalsu("pkexec");
+ if (pkexeclocation != "REQCNOTFOUND" && app.applicationFilePath() == "/usr/bin/unetbootin" && QFile::exists("/usr/share/polkit-1/actions/org.unetbootin.pkexec.unetbootin.policy"))
+ {
+ //QProcess::startDetached(QString("%1 %2 %3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(QString("%1 %2 %3").arg(pkexeclocation).arg(app.applicationFilePath()).arg(argsconc));
+ return 0;
+ }
+ */
+ QString gksulocation = checkforgraphicalsu("gksu");
if (gksulocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2 %3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2 %3").arg(gksulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(gksulocation, gksuargs);
return 0;
}
QString kdesulocation = checkforgraphicalsu("kdesu");
if (kdesulocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2 %3").arg(kdesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2 %3").arg(kdesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(kdesulocation, gksuargs);
return 0;
}
QString gnomesulocation = checkforgraphicalsu("gnomesu");
if (gnomesulocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2 %3").arg(gnomesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2 %3").arg(gnomesulocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(gnomesulocation, gksuargs);
return 0;
}
QString kdesudolocation = checkforgraphicalsu("kdesudo");
if (kdesudolocation != "REQCNOTFOUND")
{
- QProcess::startDetached(QString("%1 %2 %3").arg(kdesudolocation).arg(app.applicationFilePath()).arg(argsconc));
+ //QProcess::startDetached(QString("%1 %2 %3").arg(kdesudolocation).arg(app.applicationFilePath()).arg(argsconc));
+ QProcess::startDetached(kdesudolocation, gksuargs);
return 0;
}
QMessageBox rootmsgb;
rootmsgb.setIcon(QMessageBox::Warning);
rootmsgb.setWindowTitle(uninstaller::tr("Must run as root"));
rootmsgb.setTextFormat(Qt::RichText);
- rootmsgb.setText(uninstaller::tr("%2 must be run as root. Close it, and re-run using either:<br/><b>sudo %1</b><br/>or:<br/><b>su - -c '%1'</b>").arg(app.applicationFilePath()).arg(UNETBOOTINB));
+ rootmsgb.setText(uninstaller::tr("%2 must be run as root. Close it, and re-run using either:<br/><b>sudo QT_X11_NO_MITSHM=1 %1</b><br/>or:<br/><b>su -c 'QT_X11_NO_MITSHM=1 %1'</b>").arg(app.applicationFilePath()).arg(UNETBOOTINB));
rootmsgb.setStandardButtons(QMessageBox::Ok);
switch (rootmsgb.exec())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/org.unetbootin.pkexec.unetbootin.policy new/org.unetbootin.pkexec.unetbootin.policy
--- old/org.unetbootin.pkexec.unetbootin.policy 1970-01-01 01:00:00.000000000 +0100
+++ new/org.unetbootin.pkexec.unetbootin.policy 2016-05-16 10:47:38.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+ <action id="org.unetbootin.pkexec.unetbootin">
+ <message>Authentication is required to run unetbootin</message>
+