diff --git a/calamares.spec b/calamares.spec index c5e0c38..7c04442 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,6 +1,6 @@ Name: calamares Version: 1.0.1 -Release: 2mamba +Release: 4mamba Summary: Distribution-independent installer framework Group: Graphical Desktop/Applications/Utilities Vendor: openmamba @@ -9,15 +9,23 @@ Packager: Silvan Calarco URL: https://github.com/calamares/calamares ## GITSOURCE https://github.com/calamares/calamares.git v1.0.1 Source: https://github.com/calamares/calamares.git/v%{version}/calamares-%{version}.tar.bz2 +Source1: https://github.com/calamares/partitionmanager.git/calamares/partitionmanager-%{version}.tar.bz2 License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: kconfig-devel +BuildRequires: libatasmart-devel +BuildRequires: libblkid-devel BuildRequires: libboost-devel BuildRequires: libgcc +BuildRequires: libkcoreaddons-devel +BuildRequires: libki18n-devel BuildRequires: libparted-devel BuildRequires: libpython3-devel BuildRequires: libqt5-devel +BuildRequires: libsolid-devel BuildRequires: libstdc++6-devel +BuildRequires: libuuid-devel BuildRequires: libyaml-cpp-devel ## AUTOBUILDREQ-END BuildRequires: cmake @@ -47,10 +55,15 @@ This package contains libraries and header files for developing applications tha %debug_package %prep -%setup -q +%setup -q -a1 + +rmdir src/modules/partition/partitionmanager +mv partitionmanager-%{version} src/modules/partition/partitionmanager %build -%cmake -d build +%cmake -d build \ + -DWITH_PARTITIONMANAGER=ON + %make %install @@ -84,6 +97,7 @@ This package contains libraries and header files for developing applications tha %defattr(-,root,root) %{_libdir}/libcalamares.so.* %{_libdir}/libcalamaresui.so.* +%{_libdir}/libcalapm.so %dir %{_libdir}/calamares %{_libdir}/calamares/libcalamares.so %dir %{_libdir}/calamares/modules @@ -129,6 +143,8 @@ This package contains libraries and header files for developing applications tha %{_libdir}/calamares/modules/networkcfg/* %dir %{_libdir}/calamares/modules/packages %{_libdir}/calamares/modules/packages/* +%dir %{_libdir}/calamares/modules/partition +%{_libdir}/calamares/modules/partition/* %dir %{_libdir}/calamares/modules/prepare %{_libdir}/calamares/modules/prepare/* %dir %{_libdir}/calamares/modules/services @@ -159,6 +175,12 @@ This package contains libraries and header files for developing applications tha %changelog +* Sat Feb 07 2015 Silvan Calarco 1.0.1-4mamba +- rebuilt with WITH_PARTITIONMANAGER=ON + +* Fri Feb 06 2015 Silvan Calarco 1.0.1-3mamba +- rebuilt with kde5 dependencies for partition module + * Wed Feb 04 2015 Silvan Calarco 1.0.1-2mamba - rebuilt with python3-boost