Merge branch 'releases/v7.2.x' into fix-fastisochrones

GIScience · Dec 4, 2023 · 71d89e4 · 71d89e4
2 parents 1608a62 + 2ee3850
commit 71d89e4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.rpm-packaging/ors-selinux.spec b/.rpm-packaging/ors-selinux.spec
@@ -100,5 +100,7 @@ restorecon -vvRF ${ORS_HOME}
 
 %postun
 
-semanage fcontext -a -t unlabeled_t ${ORS_HOME}
-restorecon -vvRF ${ORS_HOME}
+if [ "$1" == "0" ]; then
+    semanage fcontext -a -t unlabeled_t ${ORS_HOME}
+    restorecon -vvRF ${ORS_HOME}
+fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,8 @@ RELEASING:
  -->
 
 ## [Unreleased]
+### Fixed
+- fixed setting SELinux type during update of SELinux RPM package  
 
 ## [7.2.0] - 2023-11-16
 ### Added

diff --git a/ors-api/pom.xml b/ors-api/pom.xml
@@ -30,7 +30,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>openrouteservice</artifactId>
         <groupId>org.heigit.ors</groupId>
-        <version>7.2.0</version>
+        <version>7.2.1-SNAPSHOT-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/ors-engine/pom.xml b/ors-engine/pom.xml
@@ -30,7 +30,7 @@
         <relativePath>../pom.xml</relativePath>
         <artifactId>openrouteservice</artifactId>
         <groupId>org.heigit.ors</groupId>
-        <version>7.2.0</version>
+        <version>7.2.1-SNAPSHOT-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.heigit.ors</groupId>
     <artifactId>openrouteservice</artifactId>
-    <version>7.2.0</version>
+    <version>7.2.1-SNAPSHOT-1</version>
     <packaging>pom</packaging>
     <name>openrouteservice</name>
     <url>https://openrouteservice.org</url>