diff options
| author | Eric Sandall | 2010-01-21 21:56:30 -0800 |
|---|---|---|
| committer | Eric Sandall | 2010-02-06 17:58:38 -0800 |
| commit | a2fc4beebb3cd62d97076bfde29569c72fa35582 (patch) | |
| tree | cfcd9b9e61c1d0f1139205eabd74a57ba109f90f | |
| parent | 84de0e67120d4d32ae5a1c0b3206fbe6707cec1f (diff) | |
qt4: Looks like qt4 needs to conflict even for minor revisions
(cherry picked from commit 73666e8aca16fc26ec55cf91b26613972e39eb5b)
| -rwxr-xr-x | x11-toolkits/qt4/CONFLICTS | 8 | ||||
| -rw-r--r-- | x11-toolkits/qt4/HISTORY | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS index 6c9828d6a2..be85071c32 100755 --- a/x11-toolkits/qt4/CONFLICTS +++ b/x11-toolkits/qt4/CONFLICTS @@ -1,7 +1 @@ -if spell_ok $SPELL;then - OLDQT=`installed_version $SPELL| cut -c-3` && - NEWQT=`echo $VERSION | cut -c-3` - if [[ $OLDQT != $NEWQT ]];then - conflicts qt4 y - fi -fi +conflicts qt4 y diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index ac137a530a..570e16a2d9 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,6 @@ +2010-01-21 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Looks like qt4 needs to conflict even for minor revisions + 2010-01-22 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.6.1 |