Merge branch 'version-fix' into 'master'

[rpm] Fix version numbering in dependencies. JB#45163 See merge request mer-core/sensorfw!37
sailfishos · May 8, 2019 · 034c74c · 034c74c
2 parents 5fe6f49 + 2df0b7f
commit 034c74c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/rpm/sensorfw-qt5-binder.spec b/rpm/sensorfw-qt5-binder.spec
@@ -1,5 +1,8 @@
 Name: hybris-libsensorfw-qt5-binder
+Version:    0.10.12
+Release:    0
 Provides: hybris-libsensorfw-qt5 = %{version}-%{release}
+Conflicts: hybris-libsensorfw-qt5 <= 0.10.9
 Conflicts: hybris-libsensorfw-qt5-hal
 Obsoletes: hybris-libsensorfw-qt5 < %{version}-%{release}
 

diff --git a/rpm/sensorfw-qt5-hybris.inc b/rpm/sensorfw-qt5-hybris.inc
@@ -1,6 +1,4 @@
 Summary:    Sensor Framework Qt5
-Version:    0.10.11
-Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+
 URL:        http://gitorious.org/sensorfw

diff --git a/rpm/sensorfw-qt5-hybris.spec b/rpm/sensorfw-qt5-hybris.spec
@@ -1,5 +1,8 @@
 Name: hybris-libsensorfw-qt5-hal
+Version:    0.10.12
+Release:    0
 Provides: hybris-libsensorfw-qt5 = %{version}-%{release}
+Conflicts: hybris-libsensorfw-qt5 <= 0.10.9
 Conflicts: hybris-libsensorfw-qt5-binder
 Obsoletes: hybris-libsensorfw-qt5 < %{version}-%{release}