Changes - SailfishOS Open Build Service

Changes of Revision 3

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:droid-config-addison.spec
@@ -31,16 +31,12 @@ # Device capabilities: # remove_modem: set this if your device has no modem (e.g. a WiFi-only tablet) # remove_bluetooth: set this if your device does not have a Bluetooth chip -# pixel_ratio: UI scaling factor, choose from 1.0, 1.5, 2.0. Any other value will -# default the icon pack to 1.0 resolution (it is a bug)! -# Read more on ways to do-it-together: https://bugs.nemomobile.org/show_bug.cgi?id=814 -# WARNING: pixel_ratio is experimental, and not yet ready for proper UI scalability -# tests! Please do not test/port your apps to other form factors for the time being. +# pixel_ratio: UI scaling factor. Calc shown in droid-config-@DEVICE@.spec.template # Ratio examples: # Jolla1: 1.0 # Jolla Tablet: 1.5 # Nexus 5: 2.0 -# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0) +# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25) # Overwriting other configs: # If your droid-config-$DEVICE needs to provide one or more device-specific @@ -78,21 +74,34 @@ %define rpm_vendor %{vendor} %endif +%if 0%{?android_version_major:1} +# If defined also use android version specfic sparse +# Supersedes the base sparse and is superseded by device specific sparse +%define dcd_sparse_android_version_major droid-configs-device/sparse-%{android_version_major} +%endif + %define board_mapping_dir %{_datadir}/ssu/board-mappings.d %define board_mapping_file %{board_mapping_dir}/05-%{rpm_vendor}-%{rpm_device}.ini Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1+master.20181113113115.04f8923 +Version: 1+master.20210114204920.1e8f19f +%if 0%{?_obs_build_project:1} Release: 1 -Group: Configs +%else +%define rel_date %(date +'%%Y%%m%%d%%H%%M') +Release: %{rel_date} +%endif License: GPLv2 Source0: %{name}-%{version}.tar.bz2 -BuildRequires: ssu-kickstart-configuration-jolla +BuildRequires: ssu-kickstart-configuration BuildRequires: pkgconfig(android-headers) BuildRequires: repomd-pattern-builder BuildRequires: qt5-qttools-kmap2qmap +BuildRequires: sed +Requires: sed +Requires: droid-hal %if 0%{?community_adaptation:1} # because it provides one ssu feature, do: Requires: community-adaptation @@ -150,8 +159,8 @@ Requires: ohm-plugin-ruleengine Requires: ohm-plugin-profile Requires: ohm-plugin-route -Requires: pulseaudio-modules-nemo-common >= 8.0.24 -Requires: pulseaudio-policy-enforcement >= 8.0.33 +Requires: pulseaudio-modules-nemo-common >= 11.1.24 +Requires: pulseaudio-policy-enforcement >= 11.1.35 Requires: policy-settings-common >= 0.7.3 Obsoletes: ohm-config <= 1.1.15 # ohm-configs-default should not be installed ever, thus no version @@ -167,7 +176,7 @@ %package kickstart-configuration Summary: Kickstart configuration for %{rpm_device} Provides: droid-config-kickstart-configuration -Requires: ssu-kickstart-configuration-jolla +Requires: ssu-kickstart-configuration Provides: droid-hal-kickstart-configuration # the %{name} contains ssu.ini file which is needed to build kickstarts Requires: %{name} = %{version}-%{release} @@ -187,12 +196,12 @@ %package pulseaudio-settings Summary: PulseAudio settings for %{rpm_device} hw Provides: droid-config-pulseaudio-settings -Requires: pulseaudio >= 8.0 -Requires: pulseaudio-modules-nemo-parameters >= 8.0.24 -Requires: pulseaudio-modules-nemo-stream-restore >= 8.0.24 -Requires: pulseaudio-modules-nemo-mainvolume >= 8.0.24 -Requires: pulseaudio-modules-droid >= 8.0.63 -Requires: pulseaudio-policy-enforcement >= 8.0.33 +Requires: pulseaudio >= 11.1+git4 +Requires: pulseaudio-modules-nemo-parameters >= 11.1.24 +Requires: pulseaudio-modules-nemo-stream-restore >= 11.1.24 +Requires: pulseaudio-modules-nemo-mainvolume >= 11.1.24 +Requires: pulseaudio-modules-droid >= 11.1.66 +Requires: pulseaudio-policy-enforcement >= 11.1.35 Provides: pulseaudio-settings %description pulseaudio-settings @@ -202,7 +211,6 @@ %package sailfish Provides: droid-config-sailfish Provides: theme-configs -Group: System BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: oneshot @@ -216,7 +224,6 @@ %package flashing Provides: droid-config-flashing -Group: System # Sparse image flashing support for flash-partition Requires: droid-hal-tools Summary: On device flashing files for %{rpm_device} hw @@ -229,7 +236,6 @@ %if 0%{?out_of_image_files:1} %package out-of-image-files -Group: System BuildArch: noarch Summary: Files that are used for flashing and are not needed on device. @@ -245,8 +251,6 @@ %package bluez4 Summary: %{rpm_device} packages for BlueZ 4 Conflicts: droid-config-%{rpm_device}-bluez5 -Requires: %{name} = %{version}-%{release} -Requires: %{name} = %{version} Provides: %{rpm_device}-bluez-configs Requires: bluez @@ -275,25 +279,29 @@ %package bluez5 Summary: %{rpm_device} packages for BlueZ 5 Conflicts: droid-config-%{rpm_device}-bluez4 -Requires: %{name} = %{version}-%{release} -Requires: %{name} = %{version} Provides: %{rpm_device}-bluez-configs Requires: bluez5 Conflicts: bluez +Obsoletes: bluez Requires: bluez5-libs Conflicts: bluez-libs +Obsoletes: bluez-libs Requires: bluez5-obexd Conflicts: obexd +Obsoletes: obexd Requires: kf5bluezqt-bluez5 Conflicts: kf5bluezqt-bluez4 +Obsoletes: kf5bluezqt-bluez4 +Obsoletes: kf5bluezqt-bluez4-declarative Provides: bluez5-configs Conflicts: bluez-configs Obsoletes: bluez-configs-sailfish +Obsoletes: bluez-configs-mer %description bluez5 %{summary}. @@ -307,6 +315,12 @@ %setup -q -n %{name}-%{version} %endif +%if 0%{?android_version_major:1} +# If defined also use android version specfic sparse +# Supersedes the base sparse and is superseded by device specific sparse +case %{android_version_major} in 8\|9\|10) : ;; ) echo unsupported android_version_major; exit 1; esac +%endif + %install rm -rf %{buildroot} mkdir -p %{buildroot} @@ -317,13 +331,49 @@ mkdir -p tmp/ echo "%defattr(-,root,root,-)" > tmp/droid-config.files -# Prefer files from sparse/ in the HA specific -# area over sparse/ in the dcd area +# On 64-bit ARM certain subdirs should not be moved to lib64 but kept under lib. +# Algorithm below autodetects cases under sparse/ so adaptations do not have to +# make any changes to their trees when going from armv7hl to aarch64. +do_not_move_to_lib64=( + "firmware" + "modules" + "startup" + "systemd/system" + "systemd/user" + "tmpfiles.d" + "udev" + ) copy_files_from() { config_dir=$1 if [ -d $config_dir ]; then - (cd $config_dir; find . $ -type f -or -type l $ -print ) \| sed 's/^.//' >> tmp/droid-config.files - cp -Rf $config_dir/ $RPM_BUILD_ROOT/ + olddir=$PWD + cd $config_dir + for f in $(find . $ -type f -o -type l $ -print); do
	Deleted	_service:tar_git:droid-config-addison-1+master.20181113113115.04f8923.tar.bz2 ^
	Added	_service:tar_git:droid-config-addison-1+master.20210114204920.1e8f19f.tar.bz2 ^