rpms/flatpak-rpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c10s
Branches Tags
rpms:c10s
rpms:c9s
rpms:imports/c10s/flatpak-rpm-macros-40-6.el10
rpms:imports/c10s/flatpak-rpm-macros-40-5.el10
...
pull from: rpms:c9s
Branches Tags
rpms:c9s
rpms:c10s
rpms:imports/c10s/flatpak-rpm-macros-40-6.el10
rpms:imports/c10s/flatpak-rpm-macros-40-5.el10

No commits in common. "c10s" and "c9s" have entirely different histories.
c10s ... c9s

3 changed files with 22 additions and 126 deletions
Show Stats Expand all files Collapse all files

103
flatpak-rpm-macros.spec
View File

@ -1,8 +1,8 @@
Name: flatpak-rpm-macros Name: flatpak-rpm-macros
Version: 40 Version: 34
Release: 6%{?dist} Release: 1%{?dist}
Summary: Macros for building RPMS for flatpaks Summary: Macros for building RPMS for flatpaks
Source0: macros.flatpak.in Source0: macros.flatpak
Source1: distutils.cfg Source1: distutils.cfg
Source2: flatpak.xml Source2: flatpak.xml
Source3: fontconfig-flatpak.prov Source3: fontconfig-flatpak.prov
@ -14,24 +14,22 @@ BuildRequires: python3
%description %description
The macros in this package set up the RPM build environment so built The macros in this package set up the RPM build environment so built
applications install in /app rather than /usr. This package is meant applications install in /app rather than /usr. This package is meant
only for installation in buildroots when rebuilding RPMS to package only for installation in buildroots for modules that will be packaged
in Flatpaks. as Flatpaks.
%prep %prep
%build %build
sed -e 's|__LIB__|%{_lib}|g' \
%{SOURCE0} > macros.flatpak
%install %install
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
install -t $RPM_BUILD_ROOT%{_sysconfdir}/rpm -p -m 644 macros.flatpak install -t $RPM_BUILD_ROOT%{_sysconfdir}/rpm -p -m 644 %{SOURCE0}
for v in 3.12 ; do for v in 3.9 ; do
mkdir -p $RPM_BUILD_ROOT%{_libdir}/python$v/distutils/ mkdir -p $RPM_BUILD_ROOT%{_libdir}/python$v/distutils/
install -t $RPM_BUILD_ROOT%{_libdir}/python$v/distutils/ %{SOURCE1} install -t $RPM_BUILD_ROOT%{_libdir}/python$v/distutils/ %{SOURCE1}
done done
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xmvn/config.d mkdir -p $RPM_BUILD_ROOT%{_datadir}/xmvn/config.d
install -t $RPM_BUILD_ROOT%{_sysconfdir}/xdg/xmvn/config.d -m 644 %{SOURCE2} install -t $RPM_BUILD_ROOT%{_datadir}/xmvn/config.d -m 644 %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir} mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}
install -t $RPM_BUILD_ROOT%{_rpmconfigdir} -m 755 %{SOURCE3} install -t $RPM_BUILD_ROOT%{_rpmconfigdir} -m 755 %{SOURCE3}
@ -41,91 +39,10 @@ install -t $RPM_BUILD_ROOT%{_rpmconfigdir} -m 755 %{SOURCE3}
# but I believe is necessary to properly override macros that are otherwise set. # but I believe is necessary to properly override macros that are otherwise set.
%{_sysconfdir}/rpm/ %{_sysconfdir}/rpm/
%{_libdir}/python*/distutils/distutils.cfg %{_libdir}/python*/distutils/distutils.cfg
%{_sysconfdir}/xdg/xmvn/config.d/flatpak.xml %{_datadir}/xmvn/config.d/flatpak.xml
%{_rpmconfigdir}/fontconfig-flatpak.prov %{_rpmconfigdir}/fontconfig-flatpak.prov
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 40-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jul 8 2024 Owen Talyor <otaylor@redhat.com> - 40-5
rhel10: set an appropriate value for %%{distcore}
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 40-4
- Bump release for June 2024 mass rebuild
* Tue May 14 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 40-3
- Define pandoc_datadir
* Mon Apr 08 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 40-2
- Override jurand macros
* Wed Mar 27 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 40-1
- Version bump for F40
- Define JAVA_HOME, JAVACONFDIRS and %%__maven_path
- Change xmvn configuration location
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 39-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 39-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Aug 28 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 39-4
- Define %%_localstatedir and %%__git
* Tue Aug 22 2023 Owen Taylor <otaylor@redhat.com> - 39-3
- Fix %%dist tag to be consistent with fedora-release
* Mon Aug 7 2023 Owen Taylor <otaylor@redhat.com> - 39-2
- Bump release for rebuild
* Mon Aug 7 2023 Owen Taylor <otaylor@redhat.com> - 39-1
- Set %%dist to f%%{fedora}app - this is for building without modules
* Fri Aug 04 2023 Kalev Lember <klember@redhat.com> - 39-1
- Update %%python_sitearch for python-3.12 (rhbz#2225806)
- Fix brp-compress search path to correctly compress man pages in /app
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 25 2023 Kalev Lember <klember@redhat.com> - 37-5
- Redefine __perl macro as /usr/bin/perl
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 37-3
- Fix host search paths for noarch builds
* Tue Aug 23 2022 Kalev Lember <klember@redhat.com> - 37-2
- Sync build_ldflags with redhat-rpm-config
- Drop python3_sitelib/sitearch overrides
- Override _fontbasedir to honor /app prefix
* Tue Aug 02 2022 Kalev Lember <klember@redhat.com> - 37-1
- Update %%python_sitearch for python-3.11 (#2113228)
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 35-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 35-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Oct 04 2021 Kalev Lember <klember@redhat.com> - 35-3
- Disable rpath checks as they don't work right for non-/usr prefix
* Fri Oct 01 2021 Kalev Lember <klember@redhat.com> - 35-2
- Sync ___build_pre section with macros from rpm 4.17.0
* Mon Aug 23 2021 Kalev Lember <klember@redhat.com> - 35-1
- Update %%python_sitearch for python-3.10 (#1987478)
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 34-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 29 2021 Kalev Lember <klember@redhat.com> - 34-1 * Tue Jun 29 2021 Kalev Lember <klember@redhat.com> - 34-1
- Override RPM's fontconfig auto-provide to handle /app/share/fonts - Override RPM's fontconfig auto-provide to handle /app/share/fonts

2
gating.yaml
View File

@ -1,6 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-10 - rhel-9
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

43
macros.flatpak.in → macros.flatpak
View File

@ -1,31 +1,23 @@
%flatpak 1 %flatpak 1
%distcore .el10flatpak-app
%_prefix /app %_prefix /app
%_sysconfdir %{_prefix}/etc %_sysconfdir %{_prefix}/etc
%_localstatedir %{_prefix}/var %build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags} %[ "%{toolchain}" == "clang" ? "%{?_lto_cflags}" : "" ] -L%{_libdir}
%build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags} %{_annotation_ldflags} %[ "%{toolchain}" == "clang" ? "%{?_clang_extra_ldflags}" : "" ] %{_build_id_flags} %{?_package_note_flags} -L%{_prefix}/__LIB__ %python3_sitelib %{_prefix}/lib/python3.9/site-packages
%__brp_compress %{_usr}/lib/rpm/brp-compress /app %python3_sitearch %{_libdir}/python3.9/site-packages
%__git %{_bindir}/git
%__perl %{_usr}/bin/perl
%__python2 %{_bindir}/python2
%python2_sitelib %{_prefix}/lib/python2.7/site-packages
%python2_sitearch %{_libdir}/python2.7/site-packages
%_fontbasedir %{_datadir}/fonts
%___build_pre \ %___build_pre \
RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\ RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\ RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\ RPM_OPT_FLAGS=\"%{optflags}\"\
RPM_LD_FLAGS=\"%{?build_ldflags}\"\ RPM_LD_FLAGS=\"%{?__global_ldflags}\"\
RPM_ARCH=\"%{_arch}\"\ RPM_ARCH=\"%{_arch}\"\
RPM_OS=\"%{_os}\"\ RPM_OS=\"%{_os}\"\
RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS\
export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
RPM_DOC_DIR=\"%{_docdir}\"\ RPM_DOC_DIR=\"%{_docdir}\"\
export RPM_DOC_DIR\ export RPM_DOC_DIR\
RPM_PACKAGE_NAME=\"%{NAME}\"\ RPM_PACKAGE_NAME=\"%{name}\"\
RPM_PACKAGE_VERSION=\"%{VERSION}\"\ RPM_PACKAGE_VERSION=\"%{version}\"\
RPM_PACKAGE_RELEASE=\"%{RELEASE}\"\ RPM_PACKAGE_RELEASE=\"%{release}\"\
export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\ export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
LANG=C\ LANG=C\
export LANG\ export LANG\
@ -44,7 +36,7 @@
export CPLUS_INCLUDE_PATH\ export CPLUS_INCLUDE_PATH\
C_INCLUDE_PATH="%{_prefix}/include"\ C_INCLUDE_PATH="%{_prefix}/include"\
export C_INCLUDE_PATH\ export C_INCLUDE_PATH\
GI_TYPELIB_PATH="%{_prefix}/__LIB__/girepository-1.0:%{_usr}/__LIB__/girepository-1.0"\ GI_TYPELIB_PATH="%{_libdir}/girepository-1.0:%{_usr}/%{_lib}/girepository-1.0"\
export GI_TYPELIB_PATH\ export GI_TYPELIB_PATH\
INFOPATH="%{_datadir}/info"\ INFOPATH="%{_datadir}/info"\
export INFOPATH\ export INFOPATH\
@ -55,7 +47,7 @@
PATH="%{_bindir}:%{_usr}/local/sbin:%{_usr}/bin:/bin:%{_usr}/sbin:/sbin"\ PATH="%{_bindir}:%{_usr}/local/sbin:%{_usr}/bin:/bin:%{_usr}/sbin:/sbin"\
PKG_CONFIG_GLADEUI_2_0_CATALOGDIR="%{_datadir}/glade/catalogs"\ PKG_CONFIG_GLADEUI_2_0_CATALOGDIR="%{_datadir}/glade/catalogs"\
export PKG_CONFIG_GLADEUI_2_0_CATALOGDIR\ export PKG_CONFIG_GLADEUI_2_0_CATALOGDIR\
PKG_CONFIG_PATH="%{_prefix}/__LIB__/pkgconfig:%{_datadir}/pkgconfig:%{_usr}/__LIB__/pkgconfig:%{_usr}/share/pkgconfig"\ PKG_CONFIG_PATH="%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:%{_usr}/%{_lib}/pkgconfig:%{_usr}/share/pkgconfig"\
export PKG_CONFIG_PATH\ export PKG_CONFIG_PATH\
XDG_CONFIG_DIRS="%{_sysconfdir}/xdg:/etc/xdg"\ XDG_CONFIG_DIRS="%{_sysconfdir}/xdg:/etc/xdg"\
export XDG_CONFIG_DIRS\ export XDG_CONFIG_DIRS\
@ -63,24 +55,11 @@
export XDG_DATA_DIRS\ export XDG_DATA_DIRS\
GVFS_REMOTE_VOLUME_MONITOR_IGNORE="1"\ GVFS_REMOTE_VOLUME_MONITOR_IGNORE="1"\
export GVFS_REMOTE_VOLUME_MONITOR_IGNORE\ export GVFS_REMOTE_VOLUME_MONITOR_IGNORE\
JAVA_HOME="%{_prefix}/lib/jvm/jre"\
export JAVA_HOME\
pandoc_datadir="%{_datadir}/pandoc-3.1.3"\
export pandoc_datadir\
\ \
%[%{verbose}?"set -x":""]\ %{verbose:set -x}%{!verbose:exec > /dev/null}\
umask 022\ umask 022\
cd \"%{u2p:%{_builddir}}\"\ cd \"%{u2p:%{_builddir}}\"\
# Override /usr/lib/rpm/fontconfig.prov with a version that also handles fonts # Override /usr/lib/rpm/fontconfig.prov with a version that also handles fonts
# in /app/share/fonts # in /app/share/fonts
%__font_provides %{_rpmconfigdir}/fontconfig-flatpak.prov %__font_provides %{_rpmconfigdir}/fontconfig-flatpak.prov
# Fix /usr/lib/rpm/fileattrs/maven.attr search path
%__maven_path ^/usr/share/maven-metadata/.*
# Search /app/etc/java for java.conf and javapackages-config.json
%jpb_env JAVACONFDIRS=%{_sysconfdir}/java
# rpm-build's rpath script hardcodes /usr and doesn't work right for /app prefix
%__brp_check_rpaths %{nil}
# Override buildroot jurand macros which mistakenly use %%_bindir
%java_remove_imports /usr/bin/jurand -i
%java_remove_annotations /usr/bin/jurand -i -a