From d2074f679ab28405c78218e84e6452648b2745f1 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Feb 26 2019 13:26:18 +0000
Subject: merge


---

diff --git a/.gitignore b/.gitignore
index 6e6d7e8..d9969b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /vmod-uuid-1.3.tar.gz
+/vmod-uuid-1.5.tar.gz
 /vmod-uuid-1.6.tar.gz
diff --git a/vmod-uuid.spec b/vmod-uuid.spec
index ec09977..61cb831 100644
--- a/vmod-uuid.spec
+++ b/vmod-uuid.spec
@@ -5,10 +5,12 @@ Release: 1%{?dist}
 License: BSD
 URL: https://github.com/otto-de/libvmod-uuid
 Source0: https://github.com/otto-de/lib%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+<<<<<<< HEAD
 
+=======
+>>>>>>> master
 Requires: varnish%{?_isa} = %(pkg-config --silence-errors --modversion varnishapi || echo 0)
 Requires: uuid
-
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: pkgconfig
@@ -31,7 +33,6 @@ as specified in RFC 4122. See the RFC for details about the various versions.
 %prep
 %autosetup -n lib%{name}-%{version}
 
-
 %build
 ./autogen.sh
 %configure \
@@ -65,10 +66,28 @@ find %{buildroot}/%{_libdir}/ -name  '*.a' -delete
 
 
 %changelog
+<<<<<<< HEAD
 * Tue Feb 26 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 1.6-1
 - New upstream release
 - Source tarball has no prebuilt manpages, so buildrequires python3-docutils
   for rst2man
+=======
+* Fri Feb 15 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 1.6-1
+- New upstream release
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Nov 08 2018 Ingvar Hagelund <ingvar@redpill-linpro.com> - 1.5-3
+- Rebuilt against varnish-6.1.1
+
+* Thu Oct 11 2018 Ingvar Hagelund <ingvar@redpill-linpro.com> - 1.5-2
+- Rebuilt against varnish-6.0.1
+
+* Tue Aug 07 2018 Ingvar Hagelund <ingvar@redpill-linpro.com> - 1.5-1
+- New upstream release
+- Removed patch merged upstream
+>>>>>>> master
 
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild