Fix vendor name and unpacking method have been fixed
This commit is contained in:
parent
50b13d97cb
commit
cb9ca0ca6e
2 changed files with 5 additions and 12 deletions
|
|
@ -1,2 +1,2 @@
|
||||||
tar: upstream name=@name@
|
tar: upstream name=@name@-@version@
|
||||||
tar: vendor
|
tar: vendor name=@name@-development-@version@ base=vendor
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,10 @@ Group: Networking/Other
|
||||||
Url: https://www.zerotier.com
|
Url: https://www.zerotier.com
|
||||||
|
|
||||||
# Source-url: # upstream submodule packaged with ./*.sh
|
# Source-url: # upstream submodule packaged with ./*.sh
|
||||||
Source0: %name.tar
|
Source: %name-%version.tar
|
||||||
|
|
||||||
# Cargo modules for build rust code in the zeroidc dir
|
# Cargo modules for build rust code in the zeroidc dir
|
||||||
Source1: vendor.tar
|
Source1: %name-development-%version.tar
|
||||||
|
|
||||||
ExcludeArch: armh
|
ExcludeArch: armh
|
||||||
|
|
||||||
|
|
@ -40,12 +40,7 @@ like conventional VPNs or VLANs. It can run on native systems, VMs, or
|
||||||
containers (Docker, OpenVZ, etc.).
|
containers (Docker, OpenVZ, etc.).
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
mkdir -p zerotier-one
|
%setup -a1
|
||||||
tar -xf %SOURCE0 -C zerotier-one
|
|
||||||
|
|
||||||
cd zerotier-one
|
|
||||||
|
|
||||||
tar -xf %SOURCE1 -C .
|
|
||||||
|
|
||||||
mkdir -p zeroidc/.cargo
|
mkdir -p zeroidc/.cargo
|
||||||
###
|
###
|
||||||
|
|
@ -75,14 +70,12 @@ EOF
|
||||||
#==
|
#==
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd zerotier-one
|
|
||||||
%make_build ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
|
%make_build ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
%_bindir/getent passwd zerotier-one || %_sbindir/useradd -r -d /var/lib/zerotier-one -s /sbin/nologin zerotier-one
|
%_bindir/getent passwd zerotier-one || %_sbindir/useradd -r -d /var/lib/zerotier-one -s /sbin/nologin zerotier-one
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd zerotier-one
|
|
||||||
%makeinstall_std
|
%makeinstall_std
|
||||||
mkdir -p %buildroot%_unitdir/
|
mkdir -p %buildroot%_unitdir/
|
||||||
cp debian/zerotier-one.service %buildroot%_unitdir/%name.service
|
cp debian/zerotier-one.service %buildroot%_unitdir/%name.service
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue