diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/50-flatpak.conf b/50-flatpak.conf deleted file mode 100644 index 430e8f1..0000000 --- a/50-flatpak.conf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - /usr/cache/fontconfig - - /app/share/fonts - /app/cache/fontconfig - - /app/etc/fonts/local.conf - - /run/host/fonts - /run/host/user-fonts - - - fontconfig - - /run/host/fonts-cache - /run/host/user-fonts-cache - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9e26f8d --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +flatpak-runtime-config is meant to be only modular diff --git a/defaults.json.in b/defaults.json.in deleted file mode 100644 index 709d182..0000000 --- a/defaults.json.in +++ /dev/null @@ -1,7 +0,0 @@ -{ - "libdir": "%{_libdir}", - "cflags": "%{build_cflags}", - "cxxflags": "%{build_cxxflags}", - "cppflags": "", - "ldflags": "-L/app/lib %{build_ldflags}" -} diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec deleted file mode 100644 index 0e05a9a..0000000 --- a/flatpak-runtime-config.spec +++ /dev/null @@ -1,157 +0,0 @@ -Name: flatpak-runtime-config -Version: 34 -Release: 1%{?dist} -Summary: Configuration files that live inside the flatpak runtime -Source1: 50-flatpak.conf -Source2: usercustomize.py -Source3: org.fedoraproject.Platform.appdata.xml -Source4: org.fedoraproject.Sdk.appdata.xml -Source5: defaults.json.in - -License: MIT - -BuildRequires: python3 -BuildRequires: python3-rpm-macros - -Requires: fontpackages-filesystem - -%description -This package includes configuration files that are installed into the flatpak -runtime filesystem during the runtime creation process; it is also installed -into the build root when building RPMs. It contains all configuration -files that need to be different when executing a flatpak. - -%prep - -%build - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_prefix}/cache/fontconfig -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1} - -# usercustomize.py to set up Python paths -for d in %{python3_sitelib} ; do - mkdir -p $RPM_BUILD_ROOT/$d - install -t $RPM_BUILD_ROOT/$d -m 0644 %{SOURCE2} -done - -# Install appdata for both the Platform and the Sdk -mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE3} -install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4} - -# Install flatpak-builder config file -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder -sed -e 's|%%{_libdir}|%{_libdir}|' \ - -e 's|%%{build_cflags}|%{build_cflags}|' \ - -e 's|%%{build_cxxflags}|%{build_cxxflags}|' \ - -e 's|%%{build_ldflags}|%{build_ldflags}|' \ - %{SOURCE5} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ -echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf - -# 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. - -# 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 - -%transfiletriggerin -- /app/share/glib-2.0/schemas -glib-compile-schemas /app/share/glib-2.0/schemas &> /dev/null || : - -%transfiletriggerin -- /app/share/fonts -HOME=/root /usr/bin/fc-cache -s - -%files -%dir %{_prefix}/cache -%dir %{_prefix}/cache/fontconfig -%{python3_sitelib} -%{_datadir}/metainfo/*.appdata.xml -%{_sysconfdir}/flatpak-builder/ -%{_sysconfdir}/fonts/conf.d/* -%{_sysconfdir}/ld.so.conf.d/app.conf - -%changelog -* Tue Feb 02 2021 Kalev Lember - 34-1 -- Install flatpak-builder defaults.json config file - -* Tue Jan 26 2021 Fedora Release Engineering - 33-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Kalev Lember - 33-1 -- Install appdata for both the Platform and the Sdk - -* Mon Jul 27 2020 Fedora Release Engineering - 32-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Mar 06 2020 Kalev Lember - 32-1 -- Remove Python 2 support (#1801932) - -* Tue Jan 28 2020 Fedora Release Engineering - 30-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Aug 8 2019 fedora-toolbox - 30-2 -- Fix comment location in fontconfig config file - -* Fri Jul 26 2019 Mark Otaris - 30-1 -- Update font config to match freedesktop-sdk, allowing user-installed fonts to work - -* Thu Jul 25 2019 Fedora Release Engineering - 29-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 29-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Sep 28 2018 Owen Taylor - 29-4 -- Add a usercustomize.py to set up Python paths - -* Sat Sep 8 2018 Owen Taylor - 29-3 -- Fix path to gsettings schemas in trigger - -* Sat Sep 8 2018 Owen Taylor - 29-2 -- Avoid comments leaking into scriplets - -* Sat Sep 8 2018 Owen Taylor - 29-1 -- Add file triggers from glibc, glib2, and fontconfig - -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 27-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 27-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 27-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 29 2017 Owen Taylor - 27-3 -- Make not noarch - the contents of /etc/ld.so.conf.d/app.conf - depend on 64-bit vs. 32-bit -- Rename fontconfig conf file from 'xdg-app' to 'flatpak' - -* Tue Jun 13 2017 Owen Taylor - 27-2 -See https://bugzilla.redhat.com/show_bug.cgi?id=1460081 -- Switch license to MIT -- Preserve timestamps on file installation -- Own /usr/cache since it's not a standard directory -- Require fontpackages-filesystem for /etc/fonts/conf.d - -* Wed Jun 7 2017 Owen Taylor - 27-1 -- Strip down to just config files - -* Wed Jun 3 2015 Alexander Larsson -- Initial version diff --git a/org.fedoraproject.Platform.appdata.xml b/org.fedoraproject.Platform.appdata.xml deleted file mode 100644 index c7878c7..0000000 --- a/org.fedoraproject.Platform.appdata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.fedoraproject.Platform - CC0 - - GPL-2.0+ - Fedora Platform - Shared libraries - - - - -

- The Fedora Platform is a runtime for Flatpak applications. It contains - common libraries that are shared between desktop applications, including - GTK 3, GStreamer, Qt 5, Mesa, SDL2, and many others. -

- - https://fedoraproject.org/ - diff --git a/org.fedoraproject.Sdk.appdata.xml b/org.fedoraproject.Sdk.appdata.xml deleted file mode 100644 index 1a1b975..0000000 --- a/org.fedoraproject.Sdk.appdata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.fedoraproject.Sdk - CC0 - - GPL-2.0+ - Fedora SDK - Tools and headers for developing applications - - - - -

- The Fedora Sdk is the development runtime that you can use to produce applications using - the Fedora Platform runtime. It contains everything that is in the platform, as well - as build and debugging tools and headers for the libraries. -

- - https://fedoraproject.org/ - diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 diff --git a/usercustomize.py b/usercustomize.py deleted file mode 100644 index cbca172..0000000 --- a/usercustomize.py +++ /dev/null @@ -1,9 +0,0 @@ -import site -import sysconfig - -purelib = sysconfig.get_path('purelib', vars=dict(base='/app')) -platlib = sysconfig.get_path('platlib', vars=dict(platbase='/app')) -site.addsitedir(purelib) -if platlib != purelib: - site.addsitedir(platlib) -