diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec index 122a38f..5441546 100644 --- a/dejavu-fonts.spec +++ b/dejavu-fonts.spec @@ -16,7 +16,7 @@ original style, using an open collaborative development process. Name: %{fontname}-fonts Version: 2.34 -Release: 1%{?alphatag}%{?dist} +Release: 2%{?alphatag}%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -56,9 +56,6 @@ This package consists of files used by other DejaVu packages. Summary: Variable-width sans-serif font faces Requires: %{name}-common = %{version}-%{release} -Conflicts: dejavu-fonts < 2.26-3 -Conflicts: dejavu-fonts-experimental < 2.26-3 - Obsoletes: %{name}-sans < 2.28-2 %description -n %{fontname}-sans-fonts @@ -74,9 +71,6 @@ their unabridged version. Summary: Variable-width serif font faces Requires: %{name}-common = %{version}-%{release} -Conflicts: dejavu-fonts < 2.26-3 -Conflicts: dejavu-fonts-experimental < 2.26-3 - Obsoletes: %{name}-serif < 2.28-2 %description -n %{fontname}-serif-fonts @@ -92,9 +86,6 @@ unabridged version. Summary: Monospace sans-serif font faces Requires: %{name}-common = %{version}-%{release} -Conflicts: dejavu-fonts < 2.26-3 -Conflicts: dejavu-fonts-experimental < 2.26-3 - Obsoletes: %{name}-sans-mono < 2.28-2 %description -n %{fontname}-sans-mono-fonts @@ -110,8 +101,6 @@ unabridged version. Summary: Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset Requires: %{name}-common = %{version}-%{release} -Conflicts: dejavu-lgc-fonts < 2.26-3 - Obsoletes: %{name}-lgc-sans < 2.28-2 %description -n %{fontname}-lgc-sans-fonts @@ -127,8 +116,6 @@ unicode coverage restricted to Latin, Greek and Cyrillic. Summary: Variable-width serif font faces, Latin-Greek-Cyrillic subset Requires: %{name}-common = %{version}-%{release} -Conflicts: dejavu-lgc-fonts < 2.26-3 - Obsoletes: %{name}-lgc-serif < 2.28-2 %description -n %{fontname}-lgc-serif-fonts @@ -144,8 +131,6 @@ unicode coverage restricted to Latin, Greek and Cyrillic. Summary: Monospace sans-serif font faces, Latin-Greek-Cyrillic subset Requires: %{name}-common = %{version}-%{release} -Conflicts: dejavu-lgc-fonts < 2.26-3 - Obsoletes: %{name}-lgc-sans-mono < 2.28-2 %description -n %{fontname}-lgc-sans-mono-fonts @@ -200,6 +185,10 @@ rm -fr %{buildroot} %changelog +* Thu Dec 26 2013 Parag Nemade +- 2.34-2 +- Resolves:rh#880473 - drop Conflicts: lines from spec file + * Sun Sep 01 2013 Nicolas Mailhot - 2.34-1