[Fedora-i18n-bugs] [lohit-punjabi-fonts] Upstream new release with relicensing to OFL

[Pravin Satpute]

commit a9b1233c87ecd1285a6136d953e09a21e9783c04
Author: प्रविण सातपुते <psatpute(a)redhat.com&gt;
Date:   Mon Oct 10 15:53:17 2011 +0530

    Upstream new release with relicensing to OFL

 .gitignore               |    1 +
 bug-673418.patch         |  161 +++++++++++----------------------------------
 bug-692366.patch         |   23 -------
 lohit-punjabi-fonts.spec |   14 ++--
 sources                  |    2 +-
 5 files changed, 49 insertions(+), 152 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dce2023..e2d060c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 lohit-punjabi-2.4.3.tar.gz
 lohit-punjabi-2.4.4.tar.gz
+/lohit-punjabi-2.5.0.tar.gz
diff --git a/bug-673418.patch b/bug-673418.patch
index c2e8560..cf37370 100644
--- a/bug-673418.patch
+++ b/bug-673418.patch
@@ -1,6 +1,29 @@
-diff -rup lohit-punjabi-2.4.4/Lohit-Punjabi.sfd
lohit-punjabi-2.4.4_mod/Lohit-Punjabi.sfd
---- lohit-punjabi-2.4.4/Lohit-Punjabi.sfd	2010-03-30 20:07:57.000000000 +0530
-+++ lohit-punjabi-2.4.4_mod/Lohit-Punjabi.sfd	2011-02-08 14:34:36.965936157 +0530
+diff -rup lohit-punjabi-2.5.0/66-lohit-punjabi.conf
lohit-punjabi-2.5.0_mod/66-lohit-punjabi.conf
+--- lohit-punjabi-2.5.0/66-lohit-punjabi.conf	2011-09-21 16:09:11.000000000 +0530
++++ lohit-punjabi-2.5.0_mod/66-lohit-punjabi.conf	2011-10-10 15:48:20.427258495 +0530
+@@ -12,6 +12,14 @@
+     <string>Lohit Punjabi</string>
+   </edit>
+ </match>
++<match target="font">
++  <test name="family" compare="eq">
++    <string>Lohit Punjabi</string>
++  </test>
++  <edit name="autohint" mode="assign">
++    <bool>true</bool>
++  </edit>
++</match>
+ <alias>
+   <family>Lohit Punjabi</family>
+   <default>
+@@ -19,4 +27,3 @@
+   </default>
+ </alias>
+ </fontconfig>
+-
+diff -rup lohit-punjabi-2.5.0/Lohit-Punjabi.sfd
lohit-punjabi-2.5.0_mod/Lohit-Punjabi.sfd
+--- lohit-punjabi-2.5.0/Lohit-Punjabi.sfd	2011-09-21 16:09:11.000000000 +0530
++++ lohit-punjabi-2.5.0_mod/Lohit-Punjabi.sfd	2011-10-10 15:47:10.824187658 +0530
 @@ -13,13 +13,14 @@ Descent: 154
  LayerCount: 2
  Layer: 0 1 "Back"  1
@@ -12,14 +35,14 @@ diff -rup lohit-punjabi-2.4.4/Lohit-Punjabi.sfd
lohit-punjabi-2.4.4_mod/Lohit-Pu
  OS2_WeightWidthSlopeOnly: 0
  OS2_UseTypoMetrics: 1
  CreationTime: 1159495707
--ModificationTime: 1269957425
-+ModificationTime: 1297155873
+-ModificationTime: 1316598861
++ModificationTime: 1318241828
  PfmFamily: 33
  TTFWeight: 400
  TTFWidth: 5
-@@ -524,16 +525,15 @@ ShortTable: maxp 16
+@@ -525,18 +526,17 @@ ShortTable: maxp 16
  EndShort
- LangName: 1033 "" "" "Regular" "ACE: Automatic
Control Equipments Lohit Punjabi" "" "Version 2.4.4" 
+ LangName: 1033 "" "" "Regular" "ACE: Automatic
Control Equipments Lohit Punjabi" "" "Version 2.5.0" 
  Encoding: UnicodeBmp
 -Compacted: 1
  UnicodeInterp: none
@@ -29,6 +52,8 @@ diff -rup lohit-punjabi-2.4.4/Lohit-Punjabi.sfd
lohit-punjabi-2.4.4_mod/Lohit-Pu
  FitToEm: 1
 -WinInfo: 0 37 14
 +WinInfo: 8325 37 14
+ BeginPrivate: 0
+ EndPrivate
  TeXData: 1 0 0 293164 146582 97721 0 1048576 97721 783286 444596 497025 792723 393216
433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
  AnchorClass2: "Anchor-2"  "'blwm' Below Base Mark lookup
2-1" "Anchor-0"  "'abvm' Above Base Mark in Gurmukhi lookup 1
subtable" "Anchor-1"  "'abvm' Above Base Mark in Gurmukhi
lookup 0 subtable" 
 -BeginChars: 65555 166
@@ -36,112 +61,7 @@ diff -rup lohit-punjabi-2.4.4/Lohit-Punjabi.sfd
lohit-punjabi-2.4.4_mod/Lohit-Pu
  
  StartChar: .notdef
  Encoding: 65536 -1 0
-@@ -2230,7 +2230,7 @@ StartChar: uni0A01
- Encoding: 2561 2561 50
- Width: 0
- GlyphClass: 4
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -360 506 mark 0
- AnchorPoint: "Anchor-0" -354 506 mark 0
- LayerCount: 2
-@@ -7332,9 +7332,9 @@ EndChar
- 
- StartChar: u0A47_u0A71.abvs
- Encoding: 65528 -1 158
--AltUni2: 00fff8.ffffffff.0
-+AltUni2: 00fff8.ffffffff.0 00fff8.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -112 508 mark 0
- LayerCount: 2
- Fore
-@@ -7368,9 +7368,9 @@ EndChar
- 
- StartChar: u0A48_u0A71.abvs
- Encoding: 65529 -1 159
--AltUni2: 00fff9.ffffffff.0
-+AltUni2: 00fff9.ffffffff.0 00fff9.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -110 496 mark 0
- LayerCount: 2
- Fore
-@@ -7414,9 +7414,9 @@ EndChar
- 
- StartChar: u0A4B_u0A71.abvs
- Encoding: 65530 -1 160
--AltUni2: 00fffa.ffffffff.0
-+AltUni2: 00fffa.ffffffff.0 00fffa.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -114 506 mark 0
- LayerCount: 2
- Fore
-@@ -7453,9 +7453,9 @@ EndChar
- 
- StartChar: u0A4C_u0A71.abvs
- Encoding: 65531 -1 161
--AltUni2: 00fffb.ffffffff.0
-+AltUni2: 00fffb.ffffffff.0 00fffb.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- LayerCount: 2
- Fore
- SplineSet
-@@ -7502,9 +7502,9 @@ EndChar
- 
- StartChar: u0A47_u0A70.abvs
- Encoding: 65524 -1 162
--AltUni2: 00fff4.ffffffff.0
-+AltUni2: 00fff4.ffffffff.0 00fff4.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -112 508 mark 0
- LayerCount: 2
- Fore
-@@ -7546,9 +7546,9 @@ EndChar
- 
- StartChar: u0A48_u0A70.abvs
- Encoding: 65525 -1 163
--AltUni2: 00fff5.ffffffff.0
-+AltUni2: 00fff5.ffffffff.0 00fff5.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -110 496 mark 0
- LayerCount: 2
- Fore
-@@ -7600,9 +7600,9 @@ EndChar
- 
- StartChar: u0A4B_u0A70.abvs
- Encoding: 65526 -1 164
--AltUni2: 00fff6.ffffffff.0
-+AltUni2: 00fff6.ffffffff.0 00fff6.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- AnchorPoint: "Anchor-1" -114 506 mark 0
- LayerCount: 2
- Fore
-@@ -7647,9 +7647,9 @@ EndChar
- 
- StartChar: u0A4C_u0A70.abvs
- Encoding: 65527 -1 165
--AltUni2: 00fff7.ffffffff.0
-+AltUni2: 00fff7.ffffffff.0 00fff7.ffffffff.0
- Width: 0
--Flags: HW
-+Flags: W
- LayerCount: 2
- Fore
- SplineSet
-@@ -7701,5 +7701,38 @@ SplineSet
+@@ -7694,5 +7694,37 @@ SplineSet
  EndSplineSet
  Ligature2: "'abvs' Above Base Substitutions in Gurmukhi lookup 0
subtable" u0A4C u0A70
  EndChar
@@ -149,20 +69,19 @@ diff -rup lohit-punjabi-2.4.4/Lohit-Punjabi.sfd
lohit-punjabi-2.4.4_mod/Lohit-Pu
 +StartChar: uni20B9
 +Encoding: 8377 8377 166
 +Width: 475
-+VWidth: 0
-+Flags: HWO
++Flags: HW
 +LayerCount: 2
 +Fore
 +SplineSet
 +268.85 375.438 m 0,0,1
 + 269.601 382.197 269.601 382.197 269.601 385.952 c 1,2,-1
-+ 44.3076 385.952 l 1,3,-1
-+ 63.833 433.264 l 1,4,-1
++ 44.308 385.952 l 1,3,-1
++ 63.8334 433.264 l 1,4,-1
 + 259.838 433.264 l 1,5,6
 + 255.332 442.275 255.332 442.275 248.573 449.785 c 0,7,8
 + 210.273 491.089 210.273 491.089 123.911 491.089 c 2,9,-1
-+ 44.3076 491.089 l 1,10,-1
-+ 63.833 538.4 l 1,11,-1
++ 44.308 491.089 l 1,10,-1
++ 63.8334 538.4 l 1,11,-1
 + 437.819 538.4 l 1,12,-1
 + 418.294 491.089 l 1,13,-1
 + 275.608 491.089 l 1,14,15
@@ -171,8 +90,8 @@ diff -rup lohit-punjabi-2.4.4/Lohit-Punjabi.sfd
lohit-punjabi-2.4.4_mod/Lohit-Pu
 + 418.294 385.952 l 1,18,-1
 + 322.169 385.952 l 1,19,20
 + 322.169 269.26 322.169 269.26 128.417 255.282 c 1,21,-1
-+ 380.745 -0.0498047 l 1,22,-1
-+ 305.647 -0.0498047 l 1,23,-1
++ 380.745 -0.0500634 l 1,22,-1
++ 305.647 -0.0500634 l 1,23,-1
 + 52.5684 253.029 l 1,24,-1
 + 52.5684 297.337 l 1,25,26
 + 259.756 295.835 259.756 295.835 268.85 375.438 c 0,0,1
diff --git a/lohit-punjabi-fonts.spec b/lohit-punjabi-fonts.spec
index 4518bdd..99a303b 100644
--- a/lohit-punjabi-fonts.spec
+++ b/lohit-punjabi-fonts.spec
@@ -2,12 +2,12 @@
 %global fontconf 66-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        2.4.4
-Release:        4%{?dist}
+Version:        2.5.0
+Release:        1%{?dist}
 Summary:        Free Punjabi font
 
 Group:          User Interface/X
-License:        GPLv2 with exceptions
+License:        OFL
 URL:            https://fedorahosted.org/lohit/
 Source0:       
https://fedorahosted.org/releases/l/o/lohit/%{fontname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -16,7 +16,6 @@ BuildRequires: fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 Requires:       fontpackages-filesystem
 Patch1: bug-673418.patch
-Patch2: bug-692366.patch
 Obsoletes: lohit-fonts-common < %{version}-%{release}
 
 %description
@@ -26,8 +25,6 @@ This package provides a free Punjabi truetype/opentype font.
 %prep
 %setup -q -n %{fontname}-%{version} 
 %patch1 -p1 -b .1-rupee-sign
-%patch2 -p1 -b .1-autohint-conf
-
 
 %build
 ./generate.pe *.sfd
@@ -53,10 +50,13 @@ rm -rf %{buildroot}
 
 %_font_pkg -f %{fontconf} *.ttf
 
-%doc ChangeLog COPYRIGHT COPYING AUTHORS README ChangeLog.old
+%doc ChangeLog COPYRIGHT OFL.txt AUTHORS README ChangeLog.old
 
 
 %changelog
+* Mon Oct 10 2011 Pravin Satpute <psatpute(a)redhat.com&gt; - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
 * Wed Apr 13 2011 Pravin Satpute <psatpute(a)redhat.com&gt; - 2.4.4-4
 - Resolved bug 692366
 
diff --git a/sources b/sources
index c4acd5c..d613e06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e1557d90e82edbb3f8c8b105ada039c  lohit-punjabi-2.4.4.tar.gz
+520490e2dabcef3747ec2f7d70b1e9eb  lohit-punjabi-2.5.0.tar.gz