Skip to content

Commit 664ae1f

Browse files
committed
Switching to standard RPM CMake machinery
1 parent 5ef9814 commit 664ae1f

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

installers/rpm/wsddn.spec

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ Allows your Linux machine to be discovered by Windows 10 and above systems
3434
and displayed by their Explorer "Network" views.
3535

3636
%global deps argum asio fmt isptr libxml2 modern-uuid outcome ptl spdlog sys_string tomlplusplus
37+
%global _vpath_srcdir wsddn
38+
%global _vpath_builddir wsddn/out
3739

3840
%debug_package
3941

4042
%prep
4143
for comp in wsddn %{deps}
4244
do
43-
[ -d $comp ] || (mkdir $comp && tar -C $comp --strip-components=1 -xzf %{_topdir}/SOURCES/$comp.tgz)
45+
[ -d $comp ] || (mkdir $comp && tar -C $comp --strip-components=1 --warning=no-unknown-keyword -xzf %{_topdir}/SOURCES/$comp.tgz)
4446
done
4547

4648
%build
@@ -52,28 +54,29 @@ do
5254
fetch_sources+=" -DFETCHCONTENT_SOURCE_DIR_$upcomp=`pwd`/$comp"
5355
done
5456

55-
cd wsddn
56-
cmake -S . -B out -DCMAKE_BUILD_TYPE=RelWithDebInfo $fetch_sources
57-
cmake --build out -- %{?_smp_mflags}
58-
cp installers/wsddn.conf out/
59-
sed -i "s/{RELOAD_INSTRUCTIONS}/# sudo systemctl restart wsddn\n/g" out/wsddn.conf
60-
sed -i "s/{SAMPLE_IFACE_NAME}/eth0/g" out/wsddn.conf
57+
%cmake $fetch_sources
58+
%cmake_build -- %{?_smp_mflags}
59+
60+
cp %{_vpath_srcdir}/installers/wsddn.conf %{_vpath_builddir}/
61+
sed -i "s/{RELOAD_INSTRUCTIONS}/# sudo systemctl restart wsddn\n/g" %{_vpath_builddir}/wsddn.conf
62+
sed -i "s/{SAMPLE_IFACE_NAME}/eth0/g" %{_vpath_builddir}/wsddn.conf
6163

6264

6365
%install
64-
cd wsddn
65-
cmake --install out --prefix %{buildroot}/usr
66+
67+
%cmake_install
68+
6669
mkdir -p %{buildroot}/usr/lib/systemd/system
67-
install -m 0644 config/systemd/usr/lib/systemd/system/%{name}.service \
68-
%{buildroot}/usr/lib/systemd/system/%{name}.service
70+
install -m 0644 %{_vpath_srcdir}/config/systemd/usr/lib/systemd/system/%{name}.service \
71+
%{buildroot}/usr/lib/systemd/system/%{name}.service
6972
mkdir -p %{buildroot}/%{_sysconfdir}
70-
install -m 0644 out/wsddn.conf %{buildroot}/%{_sysconfdir}/wsddn.conf
73+
install -m 0644 %{_vpath_builddir}/wsddn.conf %{buildroot}/%{_sysconfdir}/wsddn.conf
7174
mkdir -p %{buildroot}/usr/share/licenses/wsddn
72-
install -m 0644 LICENSE %{buildroot}/usr/share/licenses/wsddn/LICENSE
75+
install -m 0644 %{_vpath_srcdir}/LICENSE %{buildroot}/usr/share/licenses/wsddn/LICENSE
7376
mkdir -p %{buildroot}/usr/lib/firewalld/services
74-
install -m 0644 config/firewalls/etc/firewalld/services/%{name}.xml \
77+
install -m 0644 %{_vpath_srcdir}/config/firewalls/etc/firewalld/services/%{name}.xml \
7578
%{buildroot}/usr/lib/firewalld/services/%{name}.xml
76-
install -m 0644 config/firewalls/etc/firewalld/services/%{name}-http.xml \
79+
install -m 0644 %{_vpath_srcdir}/config/firewalls/etc/firewalld/services/%{name}-http.xml \
7780
%{buildroot}/usr/lib/firewalld/services/%{name}-http.xml
7881

7982
%files

0 commit comments

Comments
 (0)