Merge branch 'jb36034' into 'master'

Be even more explicit that rpm needs to be updated before this. See merge request mer-core/icu!10
sailfishos · Mar 22, 2019 · b8ac6c5 · b8ac6c5
2 parents 3b4b0be + 9167b2d
commit b8ac6c5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/rpm/icu.spec b/rpm/icu.spec
@@ -24,6 +24,7 @@ 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
+Requires(pre): rpm >= 4.14.1+git8
 
 %description -n lib%{name}
 The International Components for Unicode (ICU) libraries provide