diff --git a/.gitignore b/.gitignore index 5d7ba01..1d36ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /calamares-eb748cca8ebfc77c04c12c35a7aefac2b55af26f.tar.gz /calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73.tar.gz /calamares-5c6a302112cee89476c6846129dfbb64b1cb6079.tar.gz +/calamares-1.0.1.tar.gz diff --git a/calamares.spec b/calamares.spec index 5a7160f..c4933b2 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,16 +1,15 @@ -%global snapdate 20150119 -%global snaphash 5c6a302112cee89476c6846129dfbb64b1cb6079 %global partitionmanagerhash 3f1ace00592088a920f731acb1e42417f71f5e62 Name: calamares -Version: 0.17.0 -Release: 8.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ URL: http://calamares.io/ -Source0: https://github.com/calamares/calamares/archive/%{snaphash}/calamares-%{snaphash}.tar.gz +Source0: https://github.com/calamares/calamares/archive/v%{version}/calamares-%{version}.tar.gz Source1: https://github.com/calamares/partitionmanager/archive/%{partitionmanagerhash}/calamares-partitionmanager-%{partitionmanagerhash}.tar.gz +Source2: show.qml # adjust some default settings (default shipped .conf files) Patch0: calamares-default-settings.patch @@ -111,7 +110,7 @@ developing custom modules for Calamares. %prep -%setup -q -n %{name}-%{snaphash} -a 1 +%setup -q -a 1 rmdir src/modules/partition/partitionmanager mv -f partitionmanager-%{partitionmanagerhash} src/modules/partition/partitionmanager %patch0 -p1 -b .default-settings @@ -132,9 +131,10 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -# own the auto branding directory +# create the auto branding directory mkdir -p %{buildroot}%{_datadir}/calamares/branding/auto touch %{buildroot}%{_datadir}/calamares/branding/auto/branding.desc +install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/calamares/branding/auto/show.qml # own the local settings directories mkdir -p %{buildroot}%{_sysconfdir}/calamares/modules mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding @@ -173,8 +173,7 @@ images: productLogo: "$LOGO" productIcon: "$SPRITE" -slideshow: - - "$LOGO" +slideshow: "show.qml" EOF %files @@ -186,7 +185,9 @@ EOF %{_datadir}/calamares/branding/default/ %dir %{_datadir}/calamares/branding/auto/ %ghost %{_datadir}/calamares/branding/auto/branding.desc +%{_datadir}/calamares/branding/auto/show.qml %{_datadir}/calamares/modules/ +%{_datadir}/calamares/qml/ %{_datadir}/applications/calamares.desktop %{_datadir}/polkit-1/actions/com.github.calamares.calamares.policy %{_sysconfdir}/calamares/ @@ -209,6 +210,10 @@ EOF %changelog +* Mon Feb 02 2015 Kevin Kofler - 1.0.1-1 +- Update to the official release 1.0.1 (adds slideshow support, "Finished" page) +- Install a show.qml with a default, Calamares-branded slideshow + * Mon Jan 19 2015 Kevin Kofler - 0.17.0-8.20150119git5c6a302112cee - New snapshot, fixes swap fstab entries and yum/dnf package removal diff --git a/show.qml b/show.qml new file mode 100644 index 0000000..b72caae --- /dev/null +++ b/show.qml @@ -0,0 +1,44 @@ +/* === This file is part of Calamares - === + * + * Copyright 2015, Teo Mrnjavac + * Copyright 2015, Kevin Kofler + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +import QtQuick 2.0; +import calamares.slideshow 1.0; + +Presentation +{ + Slide { + Image { + id: background + source: "/usr/share/calamares/branding/default/squid.png" + width: 200; height: 200 + fillMode: Image.PreserveAspectFit + anchors.centerIn: parent + } + + Text { + anchors.horizontalCenter: background.horizontalCenter + anchors.top: background.bottom + text: "This installer is powered by Calamares, the cross-distribution installer framework.
"+ + "http://calamares.io/" + wrapMode: Text.WordWrap + width: root.width + horizontalAlignment: Text.Center + } + } +} diff --git a/sources b/sources index 12a9d4d..4ae6e5c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -819ab8033c3818d0c2b9730c4aad8eea calamares-5c6a302112cee89476c6846129dfbb64b1cb6079.tar.gz +5f7f2e0ac9a89e8f2390690ce41d2dce calamares-1.0.1.tar.gz 853bb899693b47d43a78e6142d07e235 calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz