diff options
| author | Ladislav Hagara | 2010-10-31 19:02:54 +0100 |
|---|---|---|
| committer | George Sherwood | 2010-10-31 14:10:25 -0500 |
| commit | 616394d9921cc1a126933b7d2800e39dbfd6c242 (patch) | |
| tree | c811657b573de5c75ae9727f5a24f41a686daf8e | |
| parent | 23f94017eb2bd257279b84a6b615d6a433728fc6 (diff) | |
gtk+2: CONFLICTS: removed gail, added gtk+2, #15899
(cherry picked from commit dc896f5cca70c256d6d60aca6ed49302de0f4f5a)
| -rwxr-xr-x | x11-toolkits/gtk+2/CONFLICTS | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk+2/HISTORY | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/x11-toolkits/gtk+2/CONFLICTS b/x11-toolkits/gtk+2/CONFLICTS index 50f6d21157..39cbbb7337 100755 --- a/x11-toolkits/gtk+2/CONFLICTS +++ b/x11-toolkits/gtk+2/CONFLICTS @@ -1 +1,3 @@ -conflicts gail y +if spell_ok gtk+2 && [[ $(installed_version gtk+2) < 2.22 ]]; then + conflicts gtk+2 y +fi diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY index e6933bc4da..adba9c4e89 100644 --- a/x11-toolkits/gtk+2/HISTORY +++ b/x11-toolkits/gtk+2/HISTORY @@ -1,3 +1,6 @@ +2010-10-31 Ladislav Hagara <hgr@vabo.cz> + * CONFLICTS: removed gail, added gtk+2, #15899 + 2010-10-25 Ladislav Hagara <hgr@vabo.cz> * DEPENDS: removed --with-lib{png,jpeg,tiff,jasper} #15889 |