Merge branch 'jb46130' into 'mer-5.6'

Don't use %config(noreplace). See merge request mer-core/qtbase!50
sailfishos · Sep 26, 2019 · 7a6bb23 · 7a6bb23
2 parents 7ea9b05 + af576c2
commit 7a6bb23
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rpm/qtbase.spec b/rpm/qtbase.spec
@@ -678,7 +678,7 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos
 %{_datadir}/qt5/mkspecs/devices/
 %{_datadir}/qt5/mkspecs/qdevice.pri
 %{_datadir}/qt5/mkspecs/qfeatures.pri
-%config(noreplace) %{_sysconfdir}/rpm/macros.qt5-default
+%config %{_sysconfdir}/rpm/macros.qt5-default
 
 %files qtdbus
 %defattr(-,root,root,-)