public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/systemd] rawhide: Make .conf files non-%doc, install one more license file
Date: Fri, 17 Jul 2026 10:23:05 GMT [thread overview]
Message-ID: <178428378539.1.7794095588803474295.rpms-systemd-f4e7691d3bf2@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/systemd
Branch : rawhide
Commit : f4e7691d3bf232e444d00ab91571503135ebd028
Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date : 2026-07-17T12:15:19+02:00
Stats : +11/-8 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/systemd/c/f4e7691d3bf232e444d00ab91571503135ebd028?branch=rawhide
Log:
Make .conf files non-%doc, install one more license file
Since 99-hardening.conf is supposed to be symlinked as configuration,
it cannot be marked with %doc. Also add one more license file listed
in the License line, and clean things up a bit while at it.
[skip changelog]
---
diff --git a/split-files.py b/split-files.py
index 71df1b1..52fa5c1 100644
--- a/split-files.py
+++ b/split-files.py
@@ -99,10 +99,11 @@ for file in files(buildroot):
/usr/lib.*/(security|pkgconfig)$|
/usr/lib/rpm(/macros.d|)$|
/usr/lib/firewalld(/services|)$|
- /usr/share/(locale|licenses|doc)| # no $
+ /usr/share/(locale|licenses)| # no $
+ LICENSE|
/etc(/pam\.d|/xdg|/X11|/X11/xinit|/X11.*\.d|)$|
/etc/(dnf|dnf/protected.d)$|
- /usr/(src|lib/debug)| # no $
+ /usr/(src|lib/debug)| # no $
/run$|
/var(/cache|/log|/lib|/run|)$
''', n, re.X):
@@ -283,7 +284,8 @@ for file in files(buildroot):
prefix = known_files[n].split()[:-1]
elif file.is_dir(follow_symlinks=False):
prefix = ['%dir']
- elif 'README' in n:
+ # Allow .conf files to be linked as config. They must not be %doc.
+ elif ('README' in n or '/doc/' in n) and not n.endswith('.conf'):
prefix = ['%doc']
elif n.startswith('/etc'):
prefix = ['%config(noreplace)']
@@ -301,8 +303,9 @@ for file in files(buildroot):
print(f'{prefix}{n}{suffix}', file=file)
-
-if [print(f'ERROR: no file names were written to {o.name}')
- for name, o in outputs.items()
- if o.tell() == 0 and name not in potentially_empty_outputs]:
+if [
+ print(f'ERROR: no file names were written to {o.name}')
+ for name, o in outputs.items()
+ if o.tell() == 0 and name not in potentially_empty_outputs
+]:
sys.exit(1)
diff --git a/systemd.spec b/systemd.spec
index 2d81fcd..a7e1f6e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1537,10 +1537,10 @@ fi
%global _docdir_fmt %{name}
%files -f %{name}.lang -f .file-list-main
-%doc %{_pkgdocdir}
%exclude %{_pkgdocdir}/LICENSE*
# Only the licenses texts for the licenses in License line are included.
%license LICENSE.GPL2
+%license LICENSE.LGPL2.1
%license LICENSES/MIT.txt
%ghost %dir %attr(0755,-,-) /etc/systemd/system/basic.target.wants
%ghost %dir %attr(0755,-,-) /etc/systemd/system/bluetooth.target.wants
reply other threads:[~2026-07-17 10:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178428378539.1.7794095588803474295.rpms-systemd-f4e7691d3bf2@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox