From 35fedb06106b9f8e95be358fb13737b347fc772b Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Thu, 1 Feb 2018 02:53:22 +0300
Subject: [PATCH] rpm test [4] - get git revision + fix paths

---
 contrib/rpm/i2pd-git.spec | 13 +++++++------
 contrib/rpm/i2pd.spec     |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index a8692b88..0f704691 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -1,9 +1,10 @@
 %define build_timestamp %(date +"%Y%m%d")
+%define git_revision %(git describe --tags)
 
 Name:           i2pd-git
-Version:        2.18.0
-Release:        %{build_timestamp}git%{?dist}
-Summary:        I2P router written in C++ (git)
+Version:        %{git_revision}
+Release:        git%{?dist}
+Summary:        I2P router written in C++
 Obsoletes:      %{name}-systemd
 Conflicts:      i2pd
 
@@ -62,9 +63,9 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}
 install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
 install -d -m 755 %{buildroot}%{_datadir}/i2pd
 %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
-install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}/%{_unitdir}/i2pd.service
-install -d -m 700 %{buildroot}/%{_sharedstatedir}/i2pd
-install -d -m 700 %{buildroot}/%{_localstatedir}/log/i2pd
+install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
+install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
+install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
 
 
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index e1278357..d1013e6b 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -2,7 +2,7 @@
 
 Name:           i2pd
 Version:        2.18.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        I2P router written in C++
 Obsoletes:      %{name}-systemd
 Conflicts:      i2pd-git
@@ -62,9 +62,9 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}
 install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
 install -d -m 755 %{buildroot}%{_datadir}/i2pd
 %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
-install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}/%{_unitdir}/i2pd.service
-install -d -m 700 %{buildroot}/%{_sharedstatedir}/i2pd
-install -d -m 700 %{buildroot}/%{_localstatedir}/log/i2pd
+install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
+install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
+install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates