diff --git a/.gitignore b/.gitignore index 48cb35b..dc3fdee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /calamares-7478c1266b47fde439c2882d835dc56f513ad64e.tar.gz /calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838.tar.gz /calamares-df47842fc7a03d2ebe24526fe39f3f9646607e1c.tar.gz +/calamares-01c3244396f3510467f405719ce7ec17403d2d83.tar.gz diff --git a/README.branding b/README.branding index d28e3f2..ef95bee 100644 --- a/README.branding +++ b/README.branding @@ -10,16 +10,17 @@ In order to brand Calamares, you have to create the YAML file componentName: default strings: - productName: My Remix - shortProductName: My Remix - version: 21 - shortVersion: 21 - versionedName: My Remix 21 - shortVersionedName: My Remix 21 + productName: My Remix + shortProductName: My Remix + version: 21 + shortVersion: 21 + versionedName: My Remix 21 + shortVersionedName: My Remix 21 + bootloaderEntryName: My Remix images: - productLogo: "/usr/share/calamares/branding/default/squid.png" - productIcon: "/usr/share/calamares/branding/default/squid.png" + productLogo: "/usr/share/calamares/branding/default/squid.png" + productIcon: "/usr/share/calamares/branding/default/squid.png" slideshow: - "/usr/share/calamares/branding/default/squid.png" @@ -31,7 +32,7 @@ or any other path (e.g., just "squid.png" would only work if you copy or symlink /usr/share/calamares/branding/default/squid.png to /etc/calamares/branding/default/squid.png). -The shortProductName setting will also be used in the GRUB 2 configuration. +The bootloaderEntryName setting will be used in the GRUB 2 configuration. The branding.desc file can be created from your *-release package or directly in your live kickstart. diff --git a/calamares.spec b/calamares.spec index d640a21..5533f0c 100644 --- a/calamares.spec +++ b/calamares.spec @@ -1,10 +1,10 @@ -%global snapdate 20141117 -%global snaphash df47842fc7a03d2ebe24526fe39f3f9646607e1c +%global snapdate 20141119 +%global snaphash 01c3244396f3510467f405719ce7ec17403d2d83 %global partitionmanagerhash 3f1ace00592088a920f731acb1e42417f71f5e62 Name: calamares Version: 0 -Release: 0.14.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} +Release: 0.15.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist} Summary: Installer from a live CD/DVD/USB to disk License: GPLv3+ @@ -122,21 +122,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/calamares/branding # validate the .desktop file desktop-file-validate %{buildroot}%{_datadir}/applications/calamares.desktop -%post -# write /etc/default/grub if missing -# works around https://github.com/calamares/calamares/issues/128 -if [ ! -e %{_sysconfdir}/default/grub ] ; then - cat >%{_sysconfdir}/default/grub < - 0-0.15.20141119git01c3244396f35 +- New snapshot, creates /etc/default/grub if missing (calamares#128) +- README.branding: Mention new bootloaderEntryName setting +- Remove no longer needed workaround that wrote /etc/default/grub in %%post + * Tue Nov 18 2014 Kevin Kofler - 0-0.14.20141117gitdf47842fc7a03 - New snapshot, makes Python modules get branding information from branding.desc - README.branding: Update with the resulting simplified instructions diff --git a/sources b/sources index 8040e78..134afc4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -0b7b5e39750aba07926b0adcd3939457 calamares-df47842fc7a03d2ebe24526fe39f3f9646607e1c.tar.gz +56ba9dbf0e808641aa4bedc6a3cd1b43 calamares-01c3244396f3510467f405719ce7ec17403d2d83.tar.gz 853bb899693b47d43a78e6142d07e235 calamares-partitionmanager-3f1ace00592088a920f731acb1e42417f71f5e62.tar.gz