diff --git a/.gitignore b/.gitignore index d704c50..5c586ab 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /kde-partitionmanager-*.tar.gz /kde-partitionmanager-1.0.3-20130815svn.tar.xz /partitionmanager-1.1.0.tar.xz +/partitionmanager-1.1.1.tar.xz diff --git a/kde-partitionmanager-no_table_fix.patch b/kde-partitionmanager-no_table_fix.patch deleted file mode 100644 index c05c853..0000000 --- a/kde-partitionmanager-no_table_fix.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -U 3 -H -d -r -N -- a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp ---- a/src/plugins/libparted/libpartedbackend.cpp 2014-07-09 13:41:51.000000000 +0200 -+++ b/src/plugins/libparted/libpartedbackend.cpp 2014-11-16 14:16:16.506336734 +0100 -@@ -49,11 +49,6 @@ - #include - #include - --#include --#include --#include --#include -- - #include - #include - #include -@@ -441,62 +436,23 @@ - return d; - } - --static quint32 countDevices(const QList& driveList) --{ -- quint32 rval = 0; -- -- foreach(const Solid::Device& solidDevice, driveList) -- { -- (void) solidDevice; // Silence compiler warning. --#ifndef ENABLE_UDISKS2 -- const Solid::StorageDrive* solidDrive = solidDevice.as(); -- if (solidDrive->driveType() == Solid::StorageDrive::HardDisk || -- solidDrive->driveType() == Solid::StorageDrive::CompactFlash || -- solidDrive->driveType() == Solid::StorageDrive::MemoryStick || -- solidDrive->driveType() == Solid::StorageDrive::SmartMedia || -- solidDrive->driveType() == Solid::StorageDrive::SdMmc || -- solidDrive->driveType() == Solid::StorageDrive::Xd) --#endif -- rval++; -- } -- return rval; --} -- - QList LibPartedBackend::scanDevices() - { - QList result; - -- const QList driveList = getSolidDeviceList(); -- const quint32 totalDevices = countDevices(driveList); -- -- quint32 count = 0; -- -- foreach(const Solid::Device& solidDevice, driveList) -+ ped_device_probe_all(); -+ PedDevice* pedDevice = NULL; -+ while (true) - { --#ifndef ENABLE_UDISKS2 -- const Solid::StorageDrive* solidDrive = solidDevice.as(); -- -- if (solidDrive->driveType() != Solid::StorageDrive::HardDisk && -- solidDrive->driveType() != Solid::StorageDrive::CompactFlash && -- solidDrive->driveType() != Solid::StorageDrive::MemoryStick && -- solidDrive->driveType() != Solid::StorageDrive::SmartMedia && -- solidDrive->driveType() != Solid::StorageDrive::SdMmc && -- solidDrive->driveType() != Solid::StorageDrive::Xd) -+ pedDevice = ped_device_get_next(pedDevice); -+ if (!pedDevice) -+ break; -+ if (pedDevice->type == PED_DEVICE_DM) - continue; --#endif -- -- const Solid::Block* solidBlock = solidDevice.as(); -- -- Device* d = scanDevice(solidBlock->device()); -- kWarning() << solidBlock->device(); -- -- if (d != NULL) -- { -- d->setIconName(solidDevice.icon()); -+ QString path = QString::fromUtf8(pedDevice->path); -+ Device* d = scanDevice(path); -+ if (d) - result.append(d); -- } -- -- emitScanProgress(solidBlock->device(), (++count) * 100 / totalDevices); - } - - return result; diff --git a/kde-partitionmanager.spec b/kde-partitionmanager.spec index 4a1097d..ab7ceee 100644 --- a/kde-partitionmanager.spec +++ b/kde-partitionmanager.spec @@ -2,8 +2,8 @@ %define _hardened_build 1 Name: kde-partitionmanager -Version: 1.1.0 -Release: 3%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: KDE Partition Manager License: GPLv2+ @@ -18,11 +18,6 @@ Source0: http://download.kde.org/stable/partitionmanager/%{version}/src/p Source1: kdepm-generate-tarball.sh # Source built using the following commands : sh kdepm-generate-tarball.sh 20130815 -# Backport git commit 30d8f841ed96b85056f0dd996c57eedc7646ca2f -# to fix detection of devices without partition table -# https://bugzilla.redhat.com/show_bug.cgi?id=1086351 -Patch0: kde-partitionmanager-no_table_fix.patch - BuildRequires: parted-devel, libblkid-devel, libatasmart-devel, kdelibs4-devel, gettext, cmake, desktop-file-utils Requires: parted, e2fsprogs # Require kde-filesystem @@ -44,8 +39,6 @@ to make use of all features and get full support for all file systems. %prep %setup -q -n partitionmanager-%{version} -%patch0 -p1 - ## Due to the name change ## this is already under kde4/ subdir, no need to change further imho -- rex %if 0%{?fedora} && 0%{?fedora} < 21 @@ -57,7 +50,7 @@ sed -i 's,partitionmanager.desktop,kde-partitionmanager.desktop,' src/CMakeLists %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} -DENABLE_UDISKS2=ON .. +%{cmake_kde4} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -99,6 +92,9 @@ fi %{_datadir}/appdata/partitionmanager.appdata.xml %changelog +* Sun Feb 22 2015 Mattia Verga - 1.1.1-1 +- 1.1.1 release + * Sun Nov 16 2014 Mattia Verga - 1.1.0-3 - Fix detection of devices without partition table diff --git a/sources b/sources index 3ad6c74..1ce4670 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a752c250fc5c98e22aba1d2ea309bec partitionmanager-1.1.0.tar.xz +d38f606a2dfb713df99e5a978ec9d035 partitionmanager-1.1.1.tar.xz