Merge branch 'jb36034' into 'master'

[icu] Make sure rpm is upgraded before libicu, as the old version is dependent... See merge request mer-core/icu!9
sailfishos · Mar 21, 2019 · 3b4b0be · 3b4b0be
2 parents 42cd5e2 + 867d02f
commit 3b4b0be
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/rpm/icu.spec b/rpm/icu.spec
@@ -22,6 +22,8 @@ Tools and utilities for developing with icu.
 Summary: International Components for Unicode - libraries
 Group:   System Environment/Libraries
 Obsoletes: libicu52
+# Older rpm is still dependent on icu52, and will break if this replacement is done before it is upgraded
+Conflicts: rpm < 4.14.1+git8
 
 %description -n lib%{name}
 The International Components for Unicode (ICU) libraries provide