- Resolves:rh#880473 - drop Conflicts: lines from spec file
This commit is contained in:
Parag Nemade 2013-12-26 18:52:04 +05:30
parent b7dcca4426
commit 72e1ed22ae

View File

@ -16,7 +16,7 @@ original style, using an open collaborative development process.
Name: %{fontname}-fonts Name: %{fontname}-fonts
Version: 2.34 Version: 2.34
Release: 1%{?alphatag}%{?dist} Release: 2%{?alphatag}%{?dist}
Summary: DejaVu fonts Summary: DejaVu fonts
Group: User Interface/X 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 Summary: Variable-width sans-serif font faces
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Conflicts: dejavu-fonts < 2.26-3
Conflicts: dejavu-fonts-experimental < 2.26-3
Obsoletes: %{name}-sans < 2.28-2 Obsoletes: %{name}-sans < 2.28-2
%description -n %{fontname}-sans-fonts %description -n %{fontname}-sans-fonts
@ -74,9 +71,6 @@ their unabridged version.
Summary: Variable-width serif font faces Summary: Variable-width serif font faces
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Conflicts: dejavu-fonts < 2.26-3
Conflicts: dejavu-fonts-experimental < 2.26-3
Obsoletes: %{name}-serif < 2.28-2 Obsoletes: %{name}-serif < 2.28-2
%description -n %{fontname}-serif-fonts %description -n %{fontname}-serif-fonts
@ -92,9 +86,6 @@ unabridged version.
Summary: Monospace sans-serif font faces Summary: Monospace sans-serif font faces
Requires: %{name}-common = %{version}-%{release} 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 Obsoletes: %{name}-sans-mono < 2.28-2
%description -n %{fontname}-sans-mono-fonts %description -n %{fontname}-sans-mono-fonts
@ -110,8 +101,6 @@ unabridged version.
Summary: Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset Summary: Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Conflicts: dejavu-lgc-fonts < 2.26-3
Obsoletes: %{name}-lgc-sans < 2.28-2 Obsoletes: %{name}-lgc-sans < 2.28-2
%description -n %{fontname}-lgc-sans-fonts %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 Summary: Variable-width serif font faces, Latin-Greek-Cyrillic subset
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Conflicts: dejavu-lgc-fonts < 2.26-3
Obsoletes: %{name}-lgc-serif < 2.28-2 Obsoletes: %{name}-lgc-serif < 2.28-2
%description -n %{fontname}-lgc-serif-fonts %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 Summary: Monospace sans-serif font faces, Latin-Greek-Cyrillic subset
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Conflicts: dejavu-lgc-fonts < 2.26-3
Obsoletes: %{name}-lgc-sans-mono < 2.28-2 Obsoletes: %{name}-lgc-sans-mono < 2.28-2
%description -n %{fontname}-lgc-sans-mono-fonts %description -n %{fontname}-lgc-sans-mono-fonts
@ -200,6 +185,10 @@ rm -fr %{buildroot}
%changelog %changelog
* Thu Dec 26 2013 Parag Nemade <paragn AT fedoraproject DOT org>
- 2.34-2
- Resolves:rh#880473 - drop Conflicts: lines from spec file
* Sun Sep 01 2013 Nicolas Mailhot <nicolas.mailhot at laposte.net> * Sun Sep 01 2013 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.34-1 - 2.34-1