diff --git a/.gitignore b/.gitignore index e096912..296bc99 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /partitionmanager-1.1.1.tar.xz /partitionmanager-1.2.1.tar.xz /partitionmanager-1.9.50.tar.xz +/partitionmanager-2.0.0.tar.xz diff --git a/kde-partitionmanager.spec b/kde-partitionmanager.spec index 7986c88..6275cb2 100644 --- a/kde-partitionmanager.spec +++ b/kde-partitionmanager.spec @@ -1,7 +1,7 @@ -%global unstable 1 +%global unstable 0 Name: kde-partitionmanager -Version: 1.9.50 +Version: 2.0.0 Release: 1%{?dist} Summary: KDE Partition Manager @@ -15,13 +15,14 @@ Source0: http://download.kde.org/stable/partitionmanager/%{version}/src/p BuildRequires: gettext, cmake, desktop-file-utils, libappstream-glib -BuildRequires: KPMcore-devel, libblkid-devel, libatasmart-devel +BuildRequires: KPMcore-devel = %{version} +BuildRequires: libblkid-devel, libatasmart-devel BuildRequires: kf5-rpm-macros, kf5-kconfig-devel, kf5-kcrash-devel BuildRequires: kf5-kdoctools-devel, kf5-ki18n-devel, kf5-kiconthemes-devel, kf5-kio-devel BuildRequires: qt5-qtbase-devel BuildRequires: extra-cmake-modules -Requires: KPMcore +Requires: KPMcore = %{version} Requires: kf5-filesystem %description @@ -38,7 +39,7 @@ manipulate filesystems. %prep -%setup -q -n partitionmanager-%{version} +%autosetup -n partitionmanager-%{version} %build @@ -62,11 +63,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata %post -/sbin/ldconfig /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -/sbin/ldconfig if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -80,7 +79,6 @@ fi %doc README CHANGES %license COPYING.GPL3 %{_kf5_bindir}/partitionmanager -%{_kf5_libdir}/*.so %{_kf5_datadir}/applications/*PartitionManager.desktop %{_kf5_datadir}/kxmlgui5/partitionmanager/ %{_kf5_datadir}/config.kcfg/partitionmanager.kcfg @@ -89,6 +87,11 @@ fi %{_datadir}/appdata/*PartitionManager.appdata.xml %changelog +* Thu Jan 14 2016 Mattia Verga - 2.0.0-1 +- Update to stable 2.0.0 +- Bind to same KPMcore version +- Library removed from sources + * Thu Dec 03 2015 Mattia Verga - 1.9.50-1 - Update to 1.9.50 diff --git a/partitionmanager_config.patch b/partitionmanager_config.patch deleted file mode 100644 index 9551038..0000000 --- a/partitionmanager_config.patch +++ /dev/null @@ -1,275 +0,0 @@ -diff -U 3 -H -d -r -N -- a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2015-02-17 14:01:14.000000000 +0100 -+++ b/src/CMakeLists.txt 2015-04-05 09:39:04.643645781 +0200 -@@ -31,7 +31,7 @@ - ki18n_wrap_ui(partitionmanagerprivate_SRCS ${partitionmanagerprivate_UIFILES}) - - kconfig_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc) --install(FILES config.kcfg DESTINATION ${KCFG_INSTALL_DIR}) -+install(FILES partitionmanager.kcfg DESTINATION ${KCFG_INSTALL_DIR}) - - add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS}) - generate_export_header(partitionmanagerprivate EXPORT_FILE_NAME libpartitionmanager_export.h) -diff -U 3 -H -d -r -N -- a/src/config.kcfg b/src/config.kcfg ---- a/src/config.kcfg 2015-02-17 14:01:14.000000000 +0100 -+++ b/src/config.kcfg 1970-01-01 01:00:00.000000000 +0100 -@@ -1,123 +0,0 @@ -- -- -- -- -- fs/filesystem.h -- util/capacity.h -- -- -- -- -- -- -- -- -- -- -- -- -- true -- -- -- -- 0 -- -- -- -- 2048 -- -- -- -- false -- -- -- -- true -- -- -- -- false -- -- -- -- -- -- 220,205,175 -- 187,249,207 -- 102,121,150 -- 122,145,180 -- 143,170,210 -- 155,155,130 -- 204,179,215 -- 229,201,240 -- 244,214,255 -- 216,220,135 -- 251,255,157 -- 200,255,254 -- 137,200,198 -- 210,136,142 -- 240,165,171 -- 151,220,134 -- 220,205,175 -- 173,205,255 -- 176,155,185 -- 170,30,77 -- 96,140,85 -- 33,137,108 -- 250,230,255 -- 242,155,104 -- 160,210,180 -- -- -- -- true -- -- -- -- pmlibpartedbackendplugin -- -- -- FileSystem::Ext3 -- -- -- -- -- Capacity::Byte -- Capacity::KiB -- Capacity::MiB -- Capacity::GiB -- Capacity::TiB -- Capacity::PiB -- Capacity::EiB -- -- Capacity::MiB -- -- -- -- -- -- -- random -- -- -- -diff -U 3 -H -d -r -N -- a/src/config.kcfgc b/src/config.kcfgc ---- a/src/config.kcfgc 2015-02-17 14:01:14.000000000 +0100 -+++ b/src/config.kcfgc 2015-04-05 09:39:14.097862752 +0200 -@@ -1,4 +1,4 @@ --File=config.kcfg -+File=partitionmanager.kcfg - ClassName=Config - Singleton=true - Mutators=true -diff -U 3 -H -d -r -N -- a/src/partitionmanager.kcfg b/src/partitionmanager.kcfg ---- a/src/partitionmanager.kcfg 1970-01-01 01:00:00.000000000 +0100 -+++ b/src/partitionmanager.kcfg 2015-02-17 14:01:14.000000000 +0100 -@@ -0,0 +1,123 @@ -+ -+ -+ -+ -+ fs/filesystem.h -+ util/capacity.h -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ -+ 0 -+ -+ -+ -+ 2048 -+ -+ -+ -+ false -+ -+ -+ -+ true -+ -+ -+ -+ false -+ -+ -+ -+ -+ -+ 220,205,175 -+ 187,249,207 -+ 102,121,150 -+ 122,145,180 -+ 143,170,210 -+ 155,155,130 -+ 204,179,215 -+ 229,201,240 -+ 244,214,255 -+ 216,220,135 -+ 251,255,157 -+ 200,255,254 -+ 137,200,198 -+ 210,136,142 -+ 240,165,171 -+ 151,220,134 -+ 220,205,175 -+ 173,205,255 -+ 176,155,185 -+ 170,30,77 -+ 96,140,85 -+ 33,137,108 -+ 250,230,255 -+ 242,155,104 -+ 160,210,180 -+ -+ -+ -+ true -+ -+ -+ -+ pmlibpartedbackendplugin -+ -+ -+ FileSystem::Ext3 -+ -+ -+ -+ -+ Capacity::Byte -+ Capacity::KiB -+ Capacity::MiB -+ Capacity::GiB -+ Capacity::TiB -+ Capacity::PiB -+ Capacity::EiB -+ -+ Capacity::MiB -+ -+ -+ -+ -+ -+ -+ random -+ -+ -+ diff --git a/sources b/sources index 67b35b0..0ed169a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f80b67924e827c5082697a010ff8269 partitionmanager-1.9.50.tar.xz +d50698661f443fa5ac99de6329f9d0cf partitionmanager-2.0.0.tar.xz