public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Owen W. Taylor <otaylor@fishsoup.net>
To: git-commits@fedoraproject.org
Subject: [rpms/flatpak-runtime-config] f45: Avoid comments leaking into scriplets
Date: Thu, 10 Sep 2026 21:21:38 GMT [thread overview]
Message-ID: <178907529862.1.4938928280492465994.rpms-flatpak-runtime-config-54c964f6bf2d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/flatpak-runtime-config
Branch : f45
Commit : 54c964f6bf2dece6a4aa5f6066308b13bdff8e68
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date : 2018-09-08T14:06:11-04:00
Stats : +12/-10 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/54c964f6bf2dece6a4aa5f6066308b13bdff8e68?branch=f45
Log:
Avoid comments leaking into scriplets
---
diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index 62b5dea..5c9b0e1 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,6 +1,6 @@
Name: flatpak-runtime-config
Version: 29
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Configuration files that live inside the flatpak runtime
Source1: 50-flatpak.conf
@@ -27,25 +27,25 @@ install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 644 %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf
-%post -p /sbin/ldconfig
-
# We duplicate selected file triggers from packages in the runtime, to
# extend them to cover /app as well. Some other functions that RPM file
# triggers normally provide are handled by flatpak triggers - in particular
# calling update-desktop-database and gtk-update-icon-cache.
-# From glibc - this has a limited function since symlinks are supposed to be
-# packaged, and a ld.so.cache that handles both /app and /usr is maintained
-# by flatpak. But occasionally a symlink is missed in packaging, and this
-# will make sure it is created install time, as it would be system-wide.
+# The ldconfig scriplets have a limited function since symlinks are supposed
+# to be packaged, and a ld.so.cache that handles both /app and /usr is
+# maintained by flatpak. But occasionally a symlink is missed in packaging,
+# and this will make sure it is created install time, as it would be
+# system-wide.
+
+%post -p /sbin/ldconfig
+
%transfiletriggerin -P 1999999 -- /app/lib /app/lib64
/sbin/ldconfig
-# From glib2
%transfiletriggerin -- /app/glib-2.0/schemas
glib-compile-schemas /app/glib-2.0/schemas &> /dev/null || :
-# From fontconfig
%transfiletriggerin -- /app/share/fonts
HOME=/root /usr/bin/fc-cache -s
@@ -56,10 +56,12 @@ HOME=/root /usr/bin/fc-cache -s
%{_sysconfdir}/ld.so.conf.d/app.conf
%changelog
+* Sat Sep 8 2018 Owen Taylor <otaylor@redhat.com> - 29-2
+- Avoid comments leaking into scriplets
+
* Sat Sep 8 2018 Owen Taylor <otaylor@redhat.com> - 29-1
- Add file triggers from glibc, glib2, and fontconfig
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 27-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 27-6
reply other threads:[~2026-09-10 21:21 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=178907529862.1.4938928280492465994.rpms-flatpak-runtime-config-54c964f6bf2d@fedoraproject.org \
--to=otaylor@fishsoup.net \
--cc=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