diff --git a/media-libs/tiff/tiff4-4.2.0.recipe b/media-libs/tiff/tiff-4.2.0.recipe similarity index 93% rename from media-libs/tiff/tiff4-4.2.0.recipe rename to media-libs/tiff/tiff-4.2.0.recipe index 280e76527..22d5a003b 100644 --- a/media-libs/tiff/tiff4-4.2.0.recipe +++ b/media-libs/tiff/tiff-4.2.0.recipe @@ -21,7 +21,7 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" portVersionCompat="$portVersion compat >= ${portVersion%%.*}" PROVIDES=" - tiff4$secondaryArchSuffix = $portVersionCompat + tiff$secondaryArchSuffix = $portVersionCompat lib:libtiff$secondaryArchSuffix = $libVersionCompat lib:libtiffxx$secondaryArchSuffix = $libVersionCompat " @@ -30,17 +30,20 @@ REQUIRES=" lib:libjpeg$secondaryArchSuffix lib:libz$secondaryArchSuffix " +CONFLICTS=" + tiff4 + " PROVIDES_devel=" - tiff4${secondaryArchSuffix}_devel = $portVersionCompat + tiff${secondaryArchSuffix}_devel = $portVersionCompat devel:libtiff$secondaryArchSuffix = $libVersionCompat devel:libtiffxx$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - tiff4$secondaryArchSuffix == $portVersion base + tiff$secondaryArchSuffix == $portVersion base " CONFLICTS_devel=" - tiff${secondaryArchSuffix}_devel + tiff4${secondaryArchSuffix}_devel " if [ -z "$secondaryArchSuffix" ]; then