public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/icecream] rawhide: use %sourcelist and refer to the source files by names
@ 2026-07-29 11:52 Michal Schmidt
  0 siblings, 0 replies; only message in thread
From: Michal Schmidt @ 2026-07-29 11:52 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/icecream
            Branch : rawhide
            Commit : f4cd9841932634b201f6d7b9cf11c04dedd37220
            Author : Michal Schmidt <mschmidt@redhat.com>
            Date   : 2026-07-29T10:54:05+02:00
            Stats  : +25/-22 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/icecream/c/f4cd9841932634b201f6d7b9cf11c04dedd37220?branch=rawhide

            Log:
            use %sourcelist and refer to the source files by names

I always found having to reference them by numbers confusing.

[skip changelog]

---
diff --git a/icecream.spec b/icecream.spec
index dd3dc4c..9cae838 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -6,21 +6,6 @@ Release:  %autorelease
 Summary:  Distributed compiler
 License:  GPL-2.0-or-later
 URL:      https://github.com/icecc/icecream
-Source0:  https://github.com/icecc/icecream/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:  fedora-sysconfig.icecream
-Source2:  icecream.module.in
-Source3:  icecream.fc
-Source4:  icecream.te
-Source5:  icecream.if
-Source6:  iceccd.service
-Source7:  icecc-scheduler.service
-Source9:  iceccd-wrapper
-Source10: icecc-scheduler-wrapper
-Source11: icecream.tmpfiles.conf
-Source12: icecream.xml
-Source13: icecream-scheduler.xml
-Source14: icecream.sysusers.conf
-
 BuildRequires: gcc-c++
 BuildRequires: systemd systemd-rpm-macros
 BuildRequires: libcap-ng-devel
@@ -52,6 +37,22 @@ Requires:         selinux-policy >= %{selinux_policyver}
 %define selinux_variants mls strict targeted 
 %endif
 
+%sourcelist
+https://github.com/icecc/icecream/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+fedora-sysconfig.icecream
+icecream.module.in
+icecream.fc
+icecream.te
+icecream.if
+iceccd.service
+icecc-scheduler.service
+iceccd-wrapper
+icecc-scheduler-wrapper
+icecream.tmpfiles.conf
+icecream.xml
+icecream-scheduler.xml
+icecream.sysusers.conf
+
 %patchlist
 0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
 0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
@@ -83,9 +84,11 @@ This package contains development files for %{name}.
 %autosetup -p1 -n %{name}-%{version}
 
 mkdir SELinux
-cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
+cp -p %{_sourcedir}/icecream.{fc,te,if} SELinux
 mkdir fedora
-cp -p %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE14} fedora
+cp -p %{_sourcedir}/{iceccd,icecc-scheduler}.service fedora
+cp -p %{_sourcedir}/{iceccd,icecc-scheduler}-wrapper fedora
+cp -p %{_sourcedir}/icecream.{tmpfiles,sysusers}.conf fedora
 
 %build
 ./autogen.sh
@@ -126,10 +129,10 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 install -p -m 644 fedora/icecream.tmpfiles.conf %{buildroot}/%{_tmpfilesdir}/icecream.conf
 install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d
 
-install -m644 -p -D %{SOURCE12} %{buildroot}%{_prefix}/lib/firewalld/services/icecream.xml
-install -m644 -p -D %{SOURCE13} %{buildroot}%{_prefix}/lib/firewalld/services/icecream-scheduler.xml
+install -m644 -p -D %{_sourcedir}/icecream.xml %{buildroot}%{_prefix}/lib/firewalld/services/icecream.xml
+install -m644 -p -D %{_sourcedir}/icecream-scheduler.xml %{buildroot}%{_prefix}/lib/firewalld/services/icecream-scheduler.xml
 
-install -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/icecream
+install -D -m 644 %{_sourcedir}/fedora-sysconfig.icecream %{buildroot}/%{_sysconfdir}/sysconfig/icecream
 
 # create default working dir
 mkdir -p %{buildroot}/%{_localstatedir}/cache/icecream
@@ -138,7 +141,7 @@ mkdir -p %{buildroot}/run/icecc/
 
 # Make the environment-modules file
 mkdir -p %{buildroot}%{_modulesdir}/icecream
-sed  's#@LIBEXECDIR@#%{_libexecdir}#' < %{SOURCE2} > %{buildroot}%{_modulesdir}/icecream/icecc
+sed  's#@LIBEXECDIR@#%{_libexecdir}#' < %{_sourcedir}/icecream.module.in > %{buildroot}%{_modulesdir}/icecream/icecc
 
 %if %{with selinux}
 for selinuxvariant in %{selinux_variants}; do
@@ -174,7 +177,7 @@ fi;
 install -m0644 -D fedora/icecream.sysusers.conf %{buildroot}%{_sysusersdir}/icecream.conf
 
 %pre
-%sysusers_create_compat %{SOURCE14}
+%sysusers_create_compat %{_sourcedir}/icecream.sysusers.conf
 %if %{with selinux}
 for selinuxvariant in %{selinux_variants}; do
 	%saveFileContext ${selinuxvariant}

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-29 11:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-29 11:52 [rpms/icecream] rawhide: use %sourcelist and refer to the source files by names Michal Schmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox