From f9be765e0ba896c956603ad38294812a4fd2da64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Kope=C4=8Dek?= <dkopecek@redhat.com>
Date: Thu, 2 Mar 2017 10:22:27 +0100
Subject: [PATCH] Update to latest git snapshot Disabled upstream alignment
 warning compiler flag

---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 ...ard-0.6.3-disable-cast-align-warning.patch | 13 +++++++++
 usbguard.spec                                 | 28 +++++++++++++++----
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 usbguard-0.6.3-disable-cast-align-warning.patch

diff --git a/.gitignore b/.gitignore
index 86cc7af..b526c63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /usbguard-0.6.0.tar.gz
 /usbguard-0.6.1.tar.gz
 /usbguard-0.6.2.tar.gz
+/dkopecek-usbguard-fcde518.tar.gz
diff --git a/sources b/sources
index 749f1ed..483d6cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-127b73a1eaa6ef0116e200dd836e0411  usbguard-0.6.2.tar.gz
+SHA512 (dkopecek-usbguard-fcde518.tar.gz) = c795b0ea740ab5ab64807be1cbcf89c27e26caa163800f6b4b8ece9ed326130c2ab736bad377c10ef92fc5b435fb5db68235b3def3fde5a2134c3b3b5c87ffdd
diff --git a/usbguard-0.6.3-disable-cast-align-warning.patch b/usbguard-0.6.3-disable-cast-align-warning.patch
new file mode 100644
index 0000000..20fd18a
--- /dev/null
+++ b/usbguard-0.6.3-disable-cast-align-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 6727391..51cef14 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,7 +24,7 @@ COMMON_WARNING_FLAGS+=" -Wall"
+ COMMON_WARNING_FLAGS+=" -Wextra"
+ COMMON_WARNING_FLAGS+=" -Wformat=2"
+ COMMON_WARNING_FLAGS+=" -Wredundant-decls"
+-COMMON_WARNING_FLAGS+=" -Wcast-align"
++#COMMON_WARNING_FLAGS+=" -Wcast-align"
+ COMMON_WARNING_FLAGS+=" -Wmissing-declarations"
+ COMMON_WARNING_FLAGS+=" -Wmissing-include-dirs"
+ COMMON_WARNING_FLAGS+=" -Wmissing-format-attribute"
diff --git a/usbguard.spec b/usbguard.spec
index d235309..96f1c10 100644
--- a/usbguard.spec
+++ b/usbguard.spec
@@ -1,17 +1,27 @@
 %global _hardened_build 1
 
+%global gitdate 	20170301
+%global gittag  	fcde51810701b09adb68b37523c773eb190c19ee
+%global shorttag	%(c=%{gittag}; echo ${c:0:7})
+%global user 		dkopecek
+
 Name:           usbguard
-Version:        0.6.2
-Release:        4%{?dist}
+Version:        0.6.3
+Release:        0.1.%{gitdate}git%{shorttag}%{?dist}
 Summary:        A tool for implementing USB device usage policy
 Group:          System Environment/Daemons
 License:        GPLv2+
 ## Not installed
 # src/ThirdParty/Catch: Boost Software License - Version 1.0
 URL:            https://dkopecek.github.io/usbguard
-Source0:        https://github.com/dkopecek/usbguard/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Regular source URL
+#Source0:        https://github.com/dkopecek/usbguard/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Snapshot source URL
+Source0:	https://github.com/%{user}/%{name}/tarball/%{gittag}/%{user}-%{name}-%{shorttag}.tar.gz
 Source1:        usbguard-daemon.conf
 
+Patch0: usbguard-0.6.3-disable-cast-align-warning.patch
+
 Requires: systemd
 Requires(post): systemd
 Requires(preun): systemd
@@ -83,16 +93,17 @@ The %{name}-dbus package contains an optional component that provides
 a D-Bus interface to the USBGuard daemon component.
 
 %prep
-%setup -q
+%setup -q -n %{user}-%{name}-%{shorttag}
 # Remove bundled library sources before build
 rm -rf src/ThirdParty/{Catch,PEGTL}
 
+%patch0 -p1
+
 %build
 mkdir -p ./m4
 autoreconf -i -v --no-recursive ./
 %configure \
     --disable-silent-rules \
-    --disable-static \
     --without-bundled-catch \
     --without-bundled-pegtl \
     --enable-systemd \
@@ -114,7 +125,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/usbguard
 install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/usbguard/usbguard-daemon.conf
 
 # Cleanup
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} \( -name '*.la' -o -name '*.a' \) -exec rm -f {} ';'
 
 %preun
 %systemd_preun usbguard.service
@@ -136,6 +147,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_bindir}/usbguard
 %dir %{_sysconfdir}/usbguard
 %config(noreplace) %{_sysconfdir}/usbguard/usbguard-daemon.conf
+%config(noreplace) %{_sysconfdir}/usbguard/rules.conf
 %{_unitdir}/usbguard.service
 %{_datadir}/man/man8/usbguard-daemon.8.gz
 %{_datadir}/man/man5/usbguard-daemon.conf.5.gz
@@ -179,6 +191,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Thu Mar 02 2017 Daniel Kopeček <dkopecek@redhat.com> 0.6.3-0.1.20170301
+- Update to latest git snapshot
+- Disabled upstream alignment warning compiler flag
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild