From 1d06cbf3d480808f78e5a211bafce591873fbc84 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jun 15 2017 15:25:17 +0000
Subject: Also update hwdb_parse.py


This is needed because an additional property was added and the
tests fail otherwise. I think adding of the property is OK, it's
fully backwards compatible.

Also use %if 0 syntax to make it easy to copy&paste the commands.

---

diff --git a/hwdb.patch b/hwdb.patch
index 088197c..15b2be1 100644
--- a/hwdb.patch
+++ b/hwdb.patch
@@ -277,3 +277,22 @@ index 82a4b7a575..12d97de69b 100644
 +touchpad:usb:v045ep07*
 + ID_INPUT_TOUCHPAD_INTEGRATION=internal
 + 
+diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
+index b57e6f75aa..adf8a1963e 100755
+--- a/hwdb/parse_hwdb.py
++++ b/hwdb/parse_hwdb.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+ # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
+ #
+ # This file is part of systemd. It is distrubuted under the MIT license, see
+@@ -112,6 +112,8 @@ def property_grammar():
+              ('ID_INPUT_TOUCHPAD_INTEGRATION', Or(('internal', 'external'))),
+              ('XKB_FIXED_LAYOUT', STRING),
+              ('XKB_FIXED_VARIANT', STRING),
++             ('KEYBOARD_LED_NUMLOCK', Literal('0')),
++             ('KEYBOARD_LED_CAPSLOCK', Literal('0')),
+              ('ACCEL_MOUNT_MATRIX', mount_matrix),
+             )
+     fixed_props = [Literal(name)('NAME') - Suppress('=') - val('VALUE')
diff --git a/systemd.spec b/systemd.spec
index 9a8942c..a2720a9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -40,10 +40,11 @@ Source10:       systemd-udev-trigger-no-reload.conf
 Source11:       20-grubby.install
 Source12:       https://raw.githubusercontent.com/systemd/systemd/1000522a60ceade446773c67031b47a566d4a70d/src/login/systemd-user.m4
 
-# GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v233..v233-stable
-# i=1; for j in 00*patch; do printf "Patch%04d:      %s\n" $i $j; i=$((i+1));done|xclip
-
-# GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} hwdb/[67]* > hwdb.patch
+%if 0
+GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v233..v233-stable
+i=1; for j in 00*patch; do printf "Patch%04d:      %s\n" $i $j; i=$((i+1));done|xclip
+GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[67]* hwdb/parse_hwdb.py > hwdb.patch
+%endif
 
 Patch0001:      0001-dhcp-server-add-two-missing-OOM-checks.patch
 Patch0002:      0002-import-bump-image-size-safety-limit-for-machinectl-p.patch