diff --git a/distcc.spec b/distcc.spec index 237f267..bc07bba 100644 --- a/distcc.spec +++ b/distcc.spec @@ -2,7 +2,7 @@ %define distcc_gid 28 Name: distcc Version: 3.4 -Release: 1mamba +Release: 2mamba Summary: A program to distribute builds of C, C++, Objective C or Objective C++ code across several machines on a network Group: Development/Tools Vendor: openmamba @@ -20,7 +20,7 @@ Patch0: distcc-3.1-gcc-4.8.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libatk-devel +BuildRequires: libat-spi2-core-devel BuildRequires: libavahi-devel BuildRequires: libcairo-devel BuildRequires: libgdk-pixbuf-devel @@ -29,7 +29,7 @@ BuildRequires: libgtk3-devel BuildRequires: libharfbuzz-devel BuildRequires: libpango-devel BuildRequires: libpopt-devel -BuildRequires: libpython3-devel +BuildRequires: libpython311-devel ## AUTOBUILDREQ-END %description @@ -53,6 +53,7 @@ A gnome base monitoring interface for distcc, a program to distribute builds of %build %configure \ + --sbindir=%{_bindir} \ --with-gtk \ --disable-Werror \ PYTHON=%{__python3} @@ -67,9 +68,18 @@ A gnome base monitoring interface for distcc, a program to distribute builds of install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/distccd install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/distccd install -D -m0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/distcc.sh -install -D -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/distccd +install -D -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/distccd.service install -d %{buildroot}/var/log/distccd +# Package symlinks +_targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc %{_host}-g++ + %{_host}-gcc %{_host}-gcc-$(gcc -dumpversion)) +install -d %{buildroot}%{_libdir}/distcc/bin +for bin in "${_targets[@]}"; do + ln -sf ../../bin/distcc %{buildroot}%{_libdir}/distcc/$bin + ln -sf ../../../bin/distcc %{buildroot}%{_libdir}/distcc/bin/$bin +done + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -108,8 +118,10 @@ fi %{_bindir}/distccmon-text %{_bindir}/lsdistcc %{_bindir}/pump -%{_sbindir}/update-distcc-symlinks -%{_unitdir}/distccd +%{_bindir}/update-distcc-symlinks +%dir %{_libdir}/distcc +%{_libdir}/distcc/* +%{_unitdir}/distccd.service %{python3_sitearch}/include_server/* %{python3_sitearch}/include_server-%{version}-py*.egg-info %dir %{_datadir}/doc/distcc @@ -124,6 +136,9 @@ fi %{_datadir}/pixmaps/distccmon-gnome.png %changelog +* Sun Dec 10 2023 Silvan Calarco 3.4-2mamba +- fix and update service and configuration files; create %_libdir/distcc folder with symlinks + * Wed May 19 2021 Automatic Build System 3.4-1mamba - automatic version update by autodist