mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-04-26 10:55:24 +02:00
rpm test [4] - get git revision + fix paths
This commit is contained in:
parent
0823ea666f
commit
35fedb0610
2 changed files with 11 additions and 10 deletions
|
@ -1,9 +1,10 @@
|
||||||
%define build_timestamp %(date +"%Y%m%d")
|
%define build_timestamp %(date +"%Y%m%d")
|
||||||
|
%define git_revision %(git describe --tags)
|
||||||
|
|
||||||
Name: i2pd-git
|
Name: i2pd-git
|
||||||
Version: 2.18.0
|
Version: %{git_revision}
|
||||||
Release: %{build_timestamp}git%{?dist}
|
Release: git%{?dist}
|
||||||
Summary: I2P router written in C++ (git)
|
Summary: I2P router written in C++
|
||||||
Obsoletes: %{name}-systemd
|
Obsoletes: %{name}-systemd
|
||||||
Conflicts: i2pd
|
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 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
|
||||||
install -d -m 755 %{buildroot}%{_datadir}/i2pd
|
install -d -m 755 %{buildroot}%{_datadir}/i2pd
|
||||||
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
|
%{__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 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
|
||||||
install -d -m 700 %{buildroot}/%{_sharedstatedir}/i2pd
|
install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
|
||||||
install -d -m 700 %{buildroot}/%{_localstatedir}/log/i2pd
|
install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
|
||||||
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
|
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: i2pd
|
Name: i2pd
|
||||||
Version: 2.18.0
|
Version: 2.18.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: I2P router written in C++
|
Summary: I2P router written in C++
|
||||||
Obsoletes: %{name}-systemd
|
Obsoletes: %{name}-systemd
|
||||||
Conflicts: i2pd-git
|
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 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
|
||||||
install -d -m 755 %{buildroot}%{_datadir}/i2pd
|
install -d -m 755 %{buildroot}%{_datadir}/i2pd
|
||||||
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
|
%{__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 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
|
||||||
install -d -m 700 %{buildroot}/%{_sharedstatedir}/i2pd
|
install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
|
||||||
install -d -m 700 %{buildroot}/%{_localstatedir}/log/i2pd
|
install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
|
||||||
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
|
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue