[Fedora-i18n-bugs] [lohit-assamese-fonts/f15] Upstream new release with relicensing to OFL

[Pravin Satpute]

commit 8572662713490d4f4fe7387e92a6ea7369190bf3
Author: प्रविण सातपुते <psatpute at redhat.com>
Date:   Fri Oct 7 14:57:35 2011 +0530

    Upstream new release with relicensing to OFL

 .gitignore                     |    1 +
 bug-549319-578029-586308.patch |   21 ++++++++---
 bug-673411.patch               |   79 ----------------------------------------
 bug-692359.patch               |   18 ---------
 bug-705348.patch               |   12 ------
 fsf-add.patch                  |   12 ------
 lohit-assamese-fonts.spec      |   26 +++++--------
 sources                        |    2 +-
 8 files changed, 28 insertions(+), 143 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c17978..3ccd694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 lohit-assamese-2.4.3.tar.gz
+/lohit-assamese-2.5.0.tar.gz
diff --git a/bug-549319-578029-586308.patch b/bug-549319-578029-586308.patch
index 6381838..722e0d9 100644
--- a/bug-549319-578029-586308.patch
+++ b/bug-549319-578029-586308.patch
@@ -1,7 +1,7 @@
-diff -rup lohit-assamese-2.4.3/66-lohit-assamese.conf lohit-assamese-2.4.3_mod/66-lohit-assamese.conf
---- lohit-assamese-2.4.3/66-lohit-assamese.conf	2009-09-09 15:18:33.000000000 +0530
-+++ lohit-assamese-2.4.3_mod/66-lohit-assamese.conf	2010-05-04 20:36:01.000000000 +0530
-@@ -2,13 +2,13 @@
+diff -rup lohit-assamese-2.5.0/66-lohit-assamese.conf lohit-assamese-2.5.0_mod/66-lohit-assamese.conf
+--- lohit-assamese-2.5.0/66-lohit-assamese.conf	2011-09-21 16:09:10.000000000 +0530
++++ lohit-assamese-2.5.0_mod/66-lohit-assamese.conf	2011-10-07 14:17:30.648194368 +0530
+@@ -2,16 +2,24 @@
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
  <match>
@@ -13,8 +13,19 @@ diff -rup lohit-assamese-2.4.3/66-lohit-assamese.conf lohit-assamese-2.4.3_mod/6
    <test name="family">
      <string>sans-serif</string>
    </test>
--  <edit name="family" mode="prepend_first" binding="same">
+-  <edit name="family" mode="prepend" binding="same">
 +  <edit name="family" mode="prepend">
      <string>Lohit Assamese</string>
    </edit>
  </match>
++<match target="font">
++  <test name="family" compare="eq">
++    <string>Lohit Assamese</string>
++  </test>
++  <edit name="autohint" mode="assign">
++    <bool>true</bool>
++  </edit>
++</match>
+ <alias>
+   <family>Lohit Assamese</family>
+   <default>
diff --git a/lohit-assamese-fonts.spec b/lohit-assamese-fonts.spec
index ca0a0cb..6c5eee1 100644
--- a/lohit-assamese-fonts.spec
+++ b/lohit-assamese-fonts.spec
@@ -2,25 +2,22 @@
 %global fontconf 65-0-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.3
-Release:        9%{?dist}
+Version:        2.5.0
+Release:        1%{?dist}
 Summary:        Free Assamese font
 
 Group:          User Interface/X
-License:        GPLv2 with exceptions
+License:        OFL
 URL:            https://fedorahosted.org/lohit/
-Source0:        http://pravins.fedorapeople.org/lohit/assamese/%{fontname}-%{version}.tar.gz
+Source0:        https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
-Patch1: bug-549319-578029-586308.patch
-Patch2: bug-673411.patch
-Patch3: bug-692359.patch
-Patch4: bug-705348.patch
-Patch5: fsf-add.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
+Patch1: bug-549319-578029-586308.patch
+
 
 %description
 This package provides a free Assamese truetype/opentype font.
@@ -29,11 +26,6 @@ This package provides a free Assamese truetype/opentype font.
 %prep
 %setup -q -n %{fontname}-%{version} 
 %patch1 -p1 -b .1-fix-font-conf
-%patch2 -p1 -b .2-rupee-sign
-%patch3 -p1 -b .3-auto-hint-conf
-%patch4 -p1 -b .4-auto-hint-fix-qt
-%patch5 -p1 -b .5-fsf-address-correction
-
 
 %build
 ./generate.pe *.sfd
@@ -57,13 +49,15 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 %clean
 rm -fr %{buildroot}
 
-
 %_font_pkg -f %{fontconf} *.ttf
 
-%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
+%doc ChangeLog COPYRIGHT OFL.txt AUTHORS README ChangeLog.old
 
 
 %changelog
+* Fri Oct 07 2011 Pravin Satpute <psatpute at redhat.com> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
 * Wed Apr 13 2011 Pravin Satpute <psatpute at redhat.com> - 2.4.3-9
 - fixes bug 705348
 - patch for correcting fsf address
diff --git a/sources b/sources
index 2a8bcd7..f168e7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95852a4abd82d4e14a83e3272d33f29e  lohit-assamese-2.4.3.tar.gz
+93217cb6ffd283333faa76f694f7c7a9  lohit-assamese-2.5.0.tar.gz