From 8ab39df50d67b7d41079f391dfbe17caa52f7e87 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 20 Oct 2015 20:29:08 +1000 Subject: [PATCH] Basic adjustments for ROSA --- .abf.yml | 1 - calamares-1.1.4.2-polkit-qt5.patch | 12 ++ calamares.spec | 311 ++++++++++++++--------------- 3 files changed, 166 insertions(+), 158 deletions(-) create mode 100644 calamares-1.1.4.2-polkit-qt5.patch diff --git a/.abf.yml b/.abf.yml index 0b608aa..882c21f 100644 --- a/.abf.yml +++ b/.abf.yml @@ -2,4 +2,3 @@ sources: OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665 calamares-1.1.4.2.tar.gz: 32c3a6bd38a88f388d8b3c4888c48d1c3ed2f6e5 openmandriva-install.svg: c048a90f14c7c449606e033bf148a11305fa0f70 - calamares-partitionmanager-20150617.tar.xz: dfc2406eb070b784bf8b5c0175994033be941028 diff --git a/calamares-1.1.4.2-polkit-qt5.patch b/calamares-1.1.4.2-polkit-qt5.patch new file mode 100644 index 0000000..402f5a7 --- /dev/null +++ b/calamares-1.1.4.2-polkit-qt5.patch @@ -0,0 +1,12 @@ +diff -urN calamares-1.1.4.2/CMakeLists.txt calamares-1.1.4.2-patched/CMakeLists.txt +--- calamares-1.1.4.2/CMakeLists.txt 2015-10-01 01:24:47.000000000 +1000 ++++ calamares-1.1.4.2-patched/CMakeLists.txt 2015-10-20 20:07:25.515245745 +1000 +@@ -211,7 +211,7 @@ + FILES + com.github.calamares.calamares.policy + DESTINATION +- "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" ++ "${CMAKE_INSTALL_PREFIX}${POLKITQT5-1_POLICY_FILES_INSTALL_DIR}" + ) + + install( diff --git a/calamares.spec b/calamares.spec index 77a2814..eb8e7be 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,25 +1,16 @@ -%define _disable_lto 1 -%define calamdate 20150617 -%define partdate 20150617 - %define major 1 %define libname %mklibname %{name} %{major} -%define develname %mklibname %{name} -d +%define libnameui %mklibname %{name}ui %{major} +%define devname %mklibname %{name} -d Summary: Distribution-independent installer framework Name: calamares Version: 1.1.4.2 Release: 2 -Group: System/Configuration/Other License: GPLv3+ -URL: http://calamares.io/ -# git archive --format=tar --prefix=calamares-1.1.0-$(date +%Y%m%d)/ HEAD | xz -vf > calamares-1.1.0-$(date +%Y%m%d).tar.xz -#Source0: calamares-%{version}-%{calamdate}.tar.xz +Group: System/Configuration/Other +Url: http://calamares.io/ Source0: calamares-%{version}.tar.gz -# https://github.com/calamares/partitionmanager -# Make sure you package the "calamares" branch, not "master" -# git archive --format=tar --prefix=calamares-partitionmanager-$(date +%Y%m%d)/ HEAD | xz -vf > calamares-partitionmanager-$(date +%Y%m%d).tar.xz -Source1: calamares-partitionmanager-%{partdate}.tar.xz Source2: calamares.rpmlintrc Source3: %{name}.service Source4: %{name}.target @@ -45,10 +36,26 @@ Source23: omv-removeuser.conf Source24: omv-webview.conf Source99: openmandriva-install.svg Source100: OpenMandriva-adverts.tar.xz +Patch0: calamares-1.1.4.2-polkit-qt5.patch Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch Patch2: calamares-libparted-detection.patch Patch3: 0001-Make-sure-the-FullName-is-not-empty.patch Patch4: 0002-do-not-use-users-group.patch +BuildRequires: cmake +BuildRequires: extra-cmake-modules +BuildRequires: boost-devel +BuildRequires: boost-python3-devel +BuildRequires: kf5coreaddons-devel +BuildRequires: kf5config-devel +BuildRequires: kf5i18n-devel +BuildRequires: kf5solid-devel +BuildRequires: yaml-cpp-devel +BuildRequires: pkgconfig(polkit-qt5-1) +BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(blkid) +BuildRequires: pkgconfig(libatasmart) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libparted) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Xml) @@ -62,100 +69,173 @@ BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5QuickWidgets) -BuildRequires: pkgconfig(libatasmart) -BuildRequires: pkgconfig(blkid) -BuildRequires: pkgconfig(libparted) -BuildRequires: pkgconfig(polkit-qt5-1) -BuildRequires: cmake >= 3.0 -BuildRequires: cmake(ECM) -BuildRequires: qt5-qttools -BuildRequires: qt5-linguist -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5Solid) -BuildRequires: cmake(KF5I18n) -BuildRequires: yaml-cpp-devel -BuildRequires: pkgconfig(python3) -BuildRequires: boost-devel >= 1.54.0 -BuildRequires: boost-python3-devel -BuildRequires: pkgconfig(libcrypto) Requires(post): distro-release-OpenMandriva Requires(post): distro-theme-OpenMandriva +Requires: console-setup Requires: coreutils -Requires: gawk -Requires: util-linux -Requires: gptfdisk -Requires: lvm2 +Requires: dmidecode +Requires: dosfstools Requires: dracut +Requires: e2fsprogs +Requires: gawk +Requires: gptfdisk Requires: grub2 %ifarch x86_64 # EFI currently only supported on x86_64 -Requires: grub2-efi +Requires: grub2-efi %endif -Requires: console-setup -# x11 stuff -Requires: setxkbmap -Requires: xkbcomp -Requires: xli +Requires: lvm2 Requires: NetworkManager -Requires: os-prober -Requires: e2fsprogs -Requires: dosfstools Requires: ntfs-3g -Requires: gawk -#(tpg) needs to be ported to KF5 -#Requires: partitionmanager -Requires: systemd -Requires: systemd-units -Requires: rsync -Requires: shadow -Requires: polkit -Requires: urpmi -Requires: squashfs-tools -Requires: dmidecode # (tpg) needed for calamares-install-setup Requires: openbox +Requires: os-prober +Requires: partitionmanager +Requires: polkit +Requires: rsync +Requires: setxkbmap +Requires: shadow +Requires: squashfs-tools +Requires: systemd +Requires: systemd-units +Requires: urpmi +Requires: util-linux +Requires: xkbcomp +Requires: xli ExclusiveArch: %{ix86} x86_64 %description -Calamares is a distribution-independent installer framework, -designed to install from a live CD/DVD/USB environment to -a hard disk. It includes a graphical installation -program based on Qt 5. +Calamares is a distribution-independent installer framework, designed to +install from a live CD/DVD/USB environment to a hard disk. It includes +a graphical installation program based on Qt 5. + +%files +%doc LICENSE AUTHORS +%dir %{_sysconfdir}/systemd/system/calamares.target.wants +%dir %{_libdir}/calamares +%dir %{_datadir}/calamares +%dir %{_datadir}/calamares/branding +%dir %{_datadir}/calamares/branding/default +%dir %{_sysconfdir}/calamares +%dir %{_sysconfdir}/calamares/modules +%dir %{_sysconfdir}/calamares/branding +%dir %{_sysconfdir}/calamares/branding/auto +%dir %{_datadir}/calamares/qml +%dir %{_datadir}/calamares/qml/calamares +%dir %{_datadir}/calamares/qml/calamares/slideshow +%{_presetdir}/90-%{name}.preset +%{_sysconfdir}/systemd/system/calamares.target.wants/%{name}.service +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.target +%{_sbindir}/%{name}-install-start +%{_sbindir}/%{name}-install-setup +%{_bindir}/calamares +%{_datadir}/calamares/settings.conf +%{_datadir}/calamares/branding/default/* +%{_datadir}/calamares/modules/ +%{_datadir}/calamares/qml/calamares/slideshow/*.qml +%{_datadir}/calamares/qml/calamares/slideshow/qmldir +%{_datadir}/applications/calamares.desktop +%{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy +%{_sysconfdir}/calamares/*.conf +%{_sysconfdir}/calamares/modules/*.conf +%{_libdir}/calamares/* +%ghost %{_sysconfdir}/calamares/branding/auto/branding.desc +%{_sysconfdir}/calamares/branding/auto/*.qml +%{_sysconfdir}/calamares/branding/auto/*.png +%{_iconsdir}/openmandriva-install.svg + +%post +# generate the "auto" branding +. %{_sysconfdir}/os-release + +cat >%{_sysconfdir}/calamares/branding/auto/branding.desc <%{_sysconfdir}/calamares/branding/auto/branding.desc <