diff --git a/harfbuzz-bootstrap.changes b/harfbuzz-bootstrap.changes index 5e4e2c4..55a3b15 100644 --- a/harfbuzz-bootstrap.changes +++ b/harfbuzz-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 15 15:44:47 UTC 2015 - fstrba@suse.com + +- Make harfbuzz-bootstrap-devel conflict with harfbuzz-devel + ------------------------------------------------------------------- Tue Apr 14 12:12:44 UTC 2015 - fstrba@suse.com diff --git a/harfbuzz-bootstrap.spec b/harfbuzz-bootstrap.spec index beef144..59447be 100644 --- a/harfbuzz-bootstrap.spec +++ b/harfbuzz-bootstrap.spec @@ -81,6 +81,7 @@ Summary: An OpenType text shaping engine -- Development Files Group: Development/Libraries/C and C++ %if %{build_bootstrap} Requires: %{name} = %{version} +Conflicts: harfbuzz-devel %else Requires: libharfbuzz-icu0 = %{version} Requires: libharfbuzz0 = %{version} diff --git a/harfbuzz.changes b/harfbuzz.changes index 5e4e2c4..55a3b15 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 15 15:44:47 UTC 2015 - fstrba@suse.com + +- Make harfbuzz-bootstrap-devel conflict with harfbuzz-devel + ------------------------------------------------------------------- Tue Apr 14 12:12:44 UTC 2015 - fstrba@suse.com diff --git a/harfbuzz.spec b/harfbuzz.spec index ad4e5b5..e215c2f 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -81,6 +81,7 @@ Summary: An OpenType text shaping engine -- Development Files Group: Development/Libraries/C and C++ %if %{build_bootstrap} Requires: %{name} = %{version} +Conflicts: harfbuzz-devel %else Requires: libharfbuzz-icu0 = %{version} Requires: libharfbuzz0 = %{version}