From cf598817d9eca036a5eac130ca989273140817b7 Mon Sep 17 00:00:00 2001 From: Rinigus Date: Wed, 25 Aug 2021 20:35:32 +0300 Subject: [PATCH 1/3] switch to https --- ssu/sailfishos-chum-testing.ini | 2 +- ssu/sailfishos-chum.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ssu/sailfishos-chum-testing.ini b/ssu/sailfishos-chum-testing.ini index f58c311..5a3696a 100644 --- a/ssu/sailfishos-chum-testing.ini +++ b/ssu/sailfishos-chum-testing.ini @@ -4,4 +4,4 @@ pattern = Sailfish OS Community repository: Testing repository description = Sailfish OS Community packages: Testing repository [repositories-release] -sailfishos-chum-testing = http://repo.merproject.org/obs/sailfishos:/chum:/testing/%(release)_%(arch)/ +sailfishos-chum-testing = https://repo.merproject.org/obs/sailfishos:/chum:/testing/%(release)_%(arch)/ diff --git a/ssu/sailfishos-chum.ini b/ssu/sailfishos-chum.ini index 101d674..89c2a04 100644 --- a/ssu/sailfishos-chum.ini +++ b/ssu/sailfishos-chum.ini @@ -4,4 +4,4 @@ pattern = Sailfish OS Community repository description = Sailfish OS Community packages [repositories-release] -sailfishos-chum = http://repo.merproject.org/obs/sailfishos:/chum/%(release)_%(arch)/ +sailfishos-chum = https://repo.merproject.org/obs/sailfishos:/chum/%(release)_%(arch)/ From e8bf6234d8f117a65c81d45a2f9797445d6fe7c6 Mon Sep 17 00:00:00 2001 From: Rinigus Date: Wed, 25 Aug 2021 20:36:01 +0300 Subject: [PATCH 2/3] force ssu regeneration on installation --- rpm/chum.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm/chum.spec b/rpm/chum.spec index a82d20d..0d232e5 100644 --- a/rpm/chum.spec +++ b/rpm/chum.spec @@ -37,9 +37,11 @@ cp ssu/sailfishos-chum.ini $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/ cp ssu/sailfishos-chum-testing.ini $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/ %post +rm -f /var/cache/ssu/features.ini || true ssu ur || true %post testing +rm -f /var/cache/ssu/features.ini || true ssu ur || true %postun From 1aea6f363b24bddb7e9cfcd4d3c61ad613c45d6d Mon Sep 17 00:00:00 2001 From: Rinigus Date: Wed, 25 Aug 2021 21:38:07 +0300 Subject: [PATCH 3/3] switch to https://repo.sailfishos.org --- ssu/sailfishos-chum-testing.ini | 2 +- ssu/sailfishos-chum.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ssu/sailfishos-chum-testing.ini b/ssu/sailfishos-chum-testing.ini index 5a3696a..b88c368 100644 --- a/ssu/sailfishos-chum-testing.ini +++ b/ssu/sailfishos-chum-testing.ini @@ -4,4 +4,4 @@ pattern = Sailfish OS Community repository: Testing repository description = Sailfish OS Community packages: Testing repository [repositories-release] -sailfishos-chum-testing = https://repo.merproject.org/obs/sailfishos:/chum:/testing/%(release)_%(arch)/ +sailfishos-chum-testing = https://repo.sailfishos.org/obs/sailfishos:/chum:/testing/%(release)_%(arch)/ diff --git a/ssu/sailfishos-chum.ini b/ssu/sailfishos-chum.ini index 89c2a04..4fd47d9 100644 --- a/ssu/sailfishos-chum.ini +++ b/ssu/sailfishos-chum.ini @@ -4,4 +4,4 @@ pattern = Sailfish OS Community repository description = Sailfish OS Community packages [repositories-release] -sailfishos-chum = https://repo.merproject.org/obs/sailfishos:/chum/%(release)_%(arch)/ +sailfishos-chum = https://repo.sailfishos.org/obs/sailfishos:/chum/%(release)_%(arch)/