Accepting request 492179 from home:bmwiedemann:branches:Base:System

call gzip -n to make build fully reproducible

OBS-URL: https://build.opensuse.org/request/show/492179
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=92
This commit is contained in:
Marcus Meissner 2017-05-03 12:32:16 +00:00 committed by Git OBS Bridge
parent fe88c4f86a
commit 58d83c1c56
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Apr 30 04:31:25 UTC 2017 - bwiedemann@suse.com
- call gzip -n to make build fully reproducible
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 23 23:23:20 UTC 2017 - zaitor@opensuse.org Thu Mar 23 23:23:20 UTC 2017 - zaitor@opensuse.org

View File

@ -305,13 +305,13 @@ while read line; do
XKBLAYOUT=`echo "$line" | cut -d " " -f 1` XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
echo "$XKBLAYOUT" >> layouts-list.lst echo "$XKBLAYOUT" >> layouts-list.lst
XKBVARIANT=`echo "$line" | cut -d " " -f 2` XKBVARIANT=`echo "$line" | cut -d " " -f 2`
ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > %{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip -n9 > %{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
done < layouts-variants.lst done < layouts-variants.lst
# Convert X keyboard layouts (plain, no variant) # Convert X keyboard layouts (plain, no variant)
cat layouts-list.lst | sort -u >> layouts-list-uniq.lst cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
while read line; do while read line; do
ckbcomp "$line" | gzip > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz ckbcomp "$line" | gzip -n9 > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz
done < layouts-list-uniq.lst done < layouts-list-uniq.lst
# wipe converted layouts which cannot input ASCII (rh#1031848) # wipe converted layouts which cannot input ASCII (rh#1031848)
@ -320,12 +320,12 @@ zgrep -L "U+0041" %{buildroot}/%{kbd}/keymaps/xkb/* | xargs rm -f
# Rename the converted default fi (kotoistus) layout (rh#1117891) # Rename the converted default fi (kotoistus) layout (rh#1117891)
gunzip %{buildroot}/%{kbd}/keymaps/xkb/fi.map.gz gunzip %{buildroot}/%{kbd}/keymaps/xkb/fi.map.gz
mv %{buildroot}/%{kbd}/keymaps/xkb/fi.map %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map mv %{buildroot}/%{kbd}/keymaps/xkb/fi.map %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
gzip %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map
# Fix converted cz layout - add compose rules (rh#1181581) # Fix converted cz layout - add compose rules (rh#1181581)
gunzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map.gz gunzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map.gz
patch %{buildroot}/%{kbd}/keymaps/xkb/cz.map < %{SOURCE15} patch %{buildroot}/%{kbd}/keymaps/xkb/cz.map < %{SOURCE15}
gzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map gzip -n9 %{buildroot}/%{kbd}/keymaps/xkb/cz.map
# Generate entries for systemd's /usr/share/systemd/kbd-model-map # Generate entries for systemd's /usr/share/systemd/kbd-model-map
mkdir -p %{buildroot}%{_datadir}/systemd mkdir -p %{buildroot}%{_datadir}/systemd