diff --git a/rpm/sid.spec b/rpm/sid.spec index c2ae68ad..33866045 100644 --- a/rpm/sid.spec +++ b/rpm/sid.spec @@ -1,10 +1,10 @@ -#%global commit c8e353b0ea2f9d3c2cb719f76934543e8df38a38 -#%global shortcommit %(c=%{commit}; echo ${c:0:7}) -#%global commitdate 20200828 +#global commit c8e353b0ea2f9d3c2cb719f76934543e8df38a38 +%{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} +%{?commit:%global commitdate 20200828} Name: sid Version: 0.0.3 -Release: 0%{?shortcommit:.%{commitdate}git%{shortcommit}}%{?dist} +Release: 1%{?shortcommit:.%{commitdate}git%{shortcommit}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPLv2+ @@ -12,7 +12,7 @@ URL: http://sid-project.github.io %if %{defined commit} Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz %else -Source0: https://github.com/sid-project/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/sid-project/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz %endif BuildRequires: autoconf @@ -60,7 +60,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/sid/modules/ubridge-cmd/block/*.{a,la} rm -f $RPM_BUILD_ROOT%{_libdir}/sid/modules/ubridge-cmd/type/*.{a,la} %files -%{_bindir}/sid +%{_sbindir}/sid %{_sysconfdir}/sysconfig/sid.sysconfig %{_udevrulesdir}/00-sid.rules %{_unitdir}/sid.socket @@ -183,8 +183,7 @@ Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} %description tools %files tools -%{_bindir}/usid +%{_sbindir}/usid %changelog -* Wed Aug 26 2020 Peter Rajnoha - 0.0.3-1 -- Initial release. +#* Fri Aug 28 2020 Peter Rajnoha - 0.0.3-1