Author: petersen Update of /cvs/extras/rpms/liberation-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10466
Modified Files: liberation-fonts.spec Log Message: remove redundant obsoletes, provides and conflicts from new subpackages Index: liberation-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- liberation-fonts.spec 25 Feb 2009 14:32:20 -0000 1.36 +++ liberation-fonts.spec 19 May 2009 03:11:27 -0000 1.37 @@ -10,11 +10,11 @@ New. Name: %{fontname}-fonts Summary: Fonts to replace commonly used Microsoft Windows fonts Version: 1.04.93 -Release: 10%{?dist} -# The license of the Liberation Fonts is a EULA that contains GPLv2 and two +Release: 11%{?dist} +# The license of the Liberation Fonts is a EULA that contains GPLv2 and two # exceptions: # The first exception is the standard FSF font exception. -# The second exception is an anti-lockdown clause somewhat like the one in +# The second exception is an anti-lockdown clause somewhat like the one in # GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible. License: Liberation Group: User Interface/X @@ -28,7 +28,7 @@ BuildRequires: fontpackages-devel >= %description %common_desc -Meta-package of Liberation fonts which installs Sans, Serif, and Monospace +Meta-package of Liberation fonts which installs Sans, Serif, and Monospace families. %package -n %{fontname}-fonts-common @@ -55,7 +55,7 @@ Group: User Interface/X Requires: %{fontname}-sans-fonts = %{version}-%{release} Requires: %{fontname}-serif-fonts = %{version}-%{release} Requires: %{fontname}-mono-fonts = %{version}-%{release} -Obsoletes: liberation-fonts < 1.04.93-8 +Obsoletes: liberation-fonts < 1.04.93-7 %description -n %{fontname}-fonts-compat %common_desc @@ -69,9 +69,6 @@ Meta-package for installing all three fo Summary: Sans-serif fonts to replace commonly used Microsoft Arial Group: User Interface/X Requires: %{fontname}-fonts-common = %{version}-%{release} -Conflicts: liberation-fonts < 1.04.93-8 -Obsoletes: liberation-sans-fonts < 1.04.93-8 -Provides: liberation-sans-fonts = %{version}-%{release} %description -n %{fontname}-sans-fonts %common_desc @@ -84,9 +81,6 @@ This is Sans-serif TrueType fonts that r Summary: Serif fonts to replace commonly used Microsoft Times New Roman Group: User Interface/X Requires: %{fontname}-fonts-common = %{version}-%{release} -Conflicts: liberation-fonts < 1.04.93-8 -Obsoletes: liberation-serif-fonts < 1.04.93-8 -Provides: liberation-serif-fonts = %{version}-%{release} %description -n %{fontname}-serif-fonts %common_desc @@ -100,9 +94,6 @@ Roman. Summary: Monospace fonts to replace commonly used Microsoft Courier New Group: User Interface/X Requires: %{fontname}-fonts-common = %{version}-%{release} -Conflicts: liberation-fonts < 1.04.93-8 -Obsoletes: liberation-mono-fonts < 1.04.93-8 -Provides: liberation-mono-fonts = %{version}-%{release} %description -n %{fontname}-mono-fonts %common_desc @@ -134,6 +125,9 @@ mkfontscale %{buildroot}%{_fontdir} rm -rf %{buildroot} %changelog +* Tue May 19 2009 Jens Petersen <peter...@redhat.com> - 1.04.93-11 +- remove redundant obsoletes, provides and conflicts from new subpackages + * Wed Feb 25 2009 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 1.04.93-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -169,7 +163,7 @@ rm -rf %{buildroot} * Thu Jul 17 2008 Caius Chance <ccha...@redhat.com> - 1.04.90-1.fc10 - Resolves: rhbz#258592 - (Incorrect glyph points and missing hinting instructions for U+0079, U+03BC, + (Incorrect glyph points and missing hinting instructions for U+0079, U+03BC, U+0431, U+2010..2012.) * Thu Jul 17 2008 Caius Chance <ccha...@redhat.com> - 1.04-1.fc10 @@ -217,7 +211,7 @@ rm -rf %{buildroot} - Change the license tag to "GPL + font exception" * Mon May 14 2007 Matthias Clasen <mcla...@redhat.com> 0.1-7 -- Correct the source url +- Correct the source url * Mon May 14 2007 Matthias Clasen <mcla...@redhat.com> 0.1-6 - Incorporate package review feedback _______________________________________________ Fedora-fonts-bugs-list mailing list Fedora-fonts-bugs-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list