]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
libdb + db4: The devel packages should conflict each other.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Apr 2012 13:40:12 +0000 (15:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Apr 2012 13:40:12 +0000 (15:40 +0200)
db4/db4.nm
libdb/libdb.nm

index 8f994393a5a38e743ff26ab5e1a1f368ef14f2fd..82e7255b6312e70c840813be093d6fb724d0a2d6 100644 (file)
@@ -7,7 +7,7 @@ name       = db4
 version_major = 4.8
 version_minor = 30
 version    = %{version_major}.%{version_minor}
-release    = 4
+release    = 5
 epoch      = 1
 thisapp    = db-%{version}
 
@@ -88,6 +88,12 @@ packages
                # Overwrite because of epoch != 0.
                requires = %{name}=%{epoch}:%{thisver}
 
+               # You cannot install libdb-devel and db4-devel
+               # at the same time.
+               conflicts
+                       libdb-devel
+               end
+
                files
                        %{includedir}
                        %{libdir}/libdb.so
index 9fd650894ccfc62618eb796cc35e39612f20d12f..bee134c56457a098baee0072dc6cff99d008f8b7 100644 (file)
@@ -8,7 +8,7 @@ version_major = 5
 version_minor = 2
 version_patch = 36
 version    = %{version_major}.%{version_minor}.%{version_patch}
-release    = 2
+release    = 3
 thisapp    = db-%{version}
 
 soversion  = %{version_major}.%{version_minor}
@@ -87,6 +87,12 @@ packages
        package %{name}-devel
                template DEVEL
 
+               # You cannot install libdb-devel and db4-devel
+               # at the same time.
+               conflicts
+                       db4-devel
+               end
+
                files += !%{libdir}/libdb-%{soversion}.so
                files += !%{libdir}/libdb_sql-%{soversion}.so
        end