From 139a6f6d519043dd69dbfe8cf3d0e1e599f17291 Mon Sep 17 00:00:00 2001
From: dani <dani@localhost.localdomain>
Date: Thu, 21 Jul 2016 15:48:33 +0200
Subject: [PATCH 1/2] Add spec file for Fedora distros

---
 packaging/fedora/README.md          | 26 +++++++++++++
 packaging/fedora/os-log-merger.spec | 60 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 packaging/fedora/README.md
 create mode 100644 packaging/fedora/os-log-merger.spec

diff --git a/packaging/fedora/README.md b/packaging/fedora/README.md
new file mode 100644
index 0000000..d6fccbc
--- /dev/null
+++ b/packaging/fedora/README.md
@@ -0,0 +1,26 @@
+# os-log-merger Packaging: RPM
+
+This specfile can be used to build os-log.merger RPM package for Red Hat based distributions. Tested on Fedora 24.
+
+## Local build
+
+### Install build tools
+```sh
+dnf install @development-tools fedora-packager
+```
+
+### Install dependencies
+```sh
+dnf builddep os-log-merger.spec
+```
+
+
+### Download source files
+```sh
+spectool --sourcedir --get-files os-log-merger.spec
+```
+
+### Build RPM
+```sh
+rpmbuild -bb os-log-merger.spec
+```
diff --git a/packaging/fedora/os-log-merger.spec b/packaging/fedora/os-log-merger.spec
new file mode 100644
index 0000000..b43003e
--- /dev/null
+++ b/packaging/fedora/os-log-merger.spec
@@ -0,0 +1,60 @@
+%global srcname os-log-merger
+%global	sum	OpenStack Log Merger
+
+Name:		python-%{srcname}
+Version:	1.0.6
+Release:	1%{?dist}
+Summary:	%{sum}
+
+License:	Apache
+URL:		https://github.com/mangelajo/os-log-merger/
+Source:         https://pypi.python.org/packages/6f/f1/b2a46907086c29725dd0e2296d6f45e7965670a05b43626abc1c81a098a0/os-log-merger-%{version}.tar.gz
+
+
+BuildRoot:      %{_tmppath}/%{srcname}-%{version}-build
+BuildArch:	noarch
+BuildRequires:	python2
+
+
+%description
+A tool designed to take a bunch of openstack logs across different projects, and merge them in a single file, ordered by time entries
+
+%package -n %{srcname}
+Summary:	%{sum}
+%{?python_provide:%python_provide python2-%{srcname}}
+
+%description -n %{srcname}
+A tool designed to take a bunch of openstack logs across different projects, and merge them in a single file, ordered by time entries
+
+
+%prep
+%autosetup -n %{srcname}-%{version}
+
+
+%build
+#%py2_build
+
+
+%install
+%py2_install
+
+
+%check
+%{__python2} setup.py test
+
+%files -n %{srcname}
+#%license LICENSE
+%doc README.rst
+%{python2_sitelib}/*
+%{_bindir}/os-log-merger
+%{_bindir}/oslogmerger
+%{_bindir}/netprobe
+
+
+
+%changelog
+* Tue Jul 19 2016 dani - 1.0.6-1
+- First version of the os-log-merger-package
+
+
+- 

From 6a70bd6b49ecfd6d8a24f774abfaa3c7d2bc0456 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Fri, 22 Jul 2016 08:37:05 +0200
Subject: [PATCH 2/2] clean empty bullet at the end of the changelog section

---
 packaging/fedora/os-log-merger.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packaging/fedora/os-log-merger.spec b/packaging/fedora/os-log-merger.spec
index b43003e..e81a926 100644
--- a/packaging/fedora/os-log-merger.spec
+++ b/packaging/fedora/os-log-merger.spec
@@ -51,10 +51,7 @@ A tool designed to take a bunch of openstack logs across different projects, and
 %{_bindir}/netprobe
 
 
-
 %changelog
 * Tue Jul 19 2016 dani - 1.0.6-1
 - First version of the os-log-merger-package
 
-
--