[meego-commits] 6734: Changes to Trunk:Testing/dejavu-fonts

[Lisa Yue]

Hi,
I have made the following changes to dejavu-fonts in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Lisa Yue

[This message was auto-generated]

---

Request #6734:

  submit:   home:lisayue:branches:Trunk:Testing/dejavu-fonts(r6)(cleanup) -> Trunk:Testing/dejavu-fonts


Message:
    * Mon Aug 16 2010 Ling Yue <ling.yue at intel.com> - 2.31
- Upgrade to v2.31, cleanup spec file. Not use spectale because of the complex spec file

State:   new          2010-08-16T20:25:44 lisayue
Comment: None



changes files:
--------------
--- dejavu-fonts.changes
+++ dejavu-fonts.changes
@@ -0,0 +1,3 @@
+* Mon Aug 16 2010 Ling Yue <ling.yue at intel.com> - 2.31
+- Upgrade to v2.31, cleanup spec file. Not use spectale because of the complex spec file
+

old:
----
  dejavu-fonts-2.29.tar.bz2

new:
----
  dejavu-fonts-2.31.tar.bz2

spec files:
-----------
--- dejavu-fonts.spec
+++ dejavu-fonts.spec
@@ -1,9 +1,4 @@
 %global fontname    dejavu
-%global archivename %{name}-%{archiveversion}
-
-
-#global archiveversion 2.24-20080512-2226
-%global archiveversion %{version}
 
 # Let the perl maintainer worry about Unicode.org data files
 %global Blocks      %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt
@@ -15,24 +10,16 @@
 purpose is to provide a wider range of characters, while maintaining the \
 original style, using an open collaborative development process.
 
-# Compat description
-%global compat_desc \
-This package only exists to help transition pre 2.26-3 DejaVu users to the new\
-package split. It will be removed after one distribution release cycle, please\
-do not reference it or depend on it in any way.\
-\
-It can be safely uninstalled.
-
 
-Name:    %{fontname}-fonts
-Version: 2.29
-Release: 2%{?alphatag}
+Name:    dejavu-fonts
+Version: 2.31
+Release: 1
 Summary: DejaVu fonts
 
 Group:     User Interface/X
 License:   Bitstream Vera and Public Domain
 URL:       http://%{name}.org/
-Source0:   %{?!alphatag:http://downloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
+Source0:   http://downloads.sourceforge.net/%{fontname}/%{name}-%{version}.tar.bz2
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Older fontforge versions will not work due to sfd format changes
@@ -51,41 +38,14 @@
 %common_desc
 
 
-%package compat
-Summary: DejaVu fonts compatibility package
-Group:     User Interface/X
-
-Obsoletes: dejavu-fonts < 2.26-3
-Obsoletes: dejavu-fonts-experimental < 2.26-3
-
-Requires: %{fontname}-sans-fonts
-Requires: %{fontname}-sans-mono-fonts
-Requires: %{fontname}-serif-fonts
-
-%description compat
-%compat_desc
-
-
-%package lgc-compat
-Summary: DejaVu fonts, LGC compatibility package
-Group:     User Interface/X
-
-Obsoletes: dejavu-lgc-fonts < 2.26-3
-
-Requires: %{fontname}-lgc-sans-fonts
-Requires: %{fontname}-lgc-sans-mono-fonts
-Requires: %{fontname}-lgc-serif-fonts
-
-%description lgc-compat
-%compat_desc
-
-
 %package common
 Summary:  Common files for the Dejavu font set
 Requires: fontpackages-filesystem
 Group:     User Interface/X
 
 Obsoletes: dejavu-fonts-doc < 2.26-6
+Obsoletes: %{name}-compat < 2.29-3
+Obsoletes: %{name}-lgc-compat < 2.29-3
 
 %description common
 %common_desc
@@ -205,7 +165,7 @@
 
 
 %prep
-%setup -q -n %{archivename}
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -241,10 +201,6 @@
 rm -fr %{buildroot}
 
 
-%files compat
-%files lgc-compat
-
-
 %files common
 %defattr(0644,root,root,0755)
 %doc AUTHORS BUGS LICENSE NEWS README

other changes:
--------------

++++++ dejavu-fonts-2.29.tar.bz2 -> dejavu-fonts-2.31.tar.bz2
22173 lines of diff (skipped)