[Fedora-i18n-bugs] [lohit-tamil-fonts/f16] Upstream new release with relicensing to OFL
by Pravin Satpute
commit 1d1fd9b2c36648a4ebe9697dcf28e9df9639e3a4
Author: प्रविण सातपुते <psatpute(a)redhat.com>
Date: Mon Oct 10 16:32:56 2011 +0530
Upstream new release with relicensing to OFL
.gitignore | 1 +
bug-549319-578039.patch | 12 ---
bug-673419.patch | 241 -----------------------------------------------
lohit-tamil-fonts.spec | 15 ++--
sources | 2 +-
5 files changed, 9 insertions(+), 262 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e30810..c725b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
lohit-tamil-2.4.3.tar.gz
lohit-tamil-2.4.4.tar.gz
lohit-tamil-2.4.5.tar.gz
+/lohit-tamil-2.5.0.tar.gz
diff --git a/lohit-tamil-fonts.spec b/lohit-tamil-fonts.spec
index b0923f9..b3d1aeb 100644
--- a/lohit-tamil-fonts.spec
+++ b/lohit-tamil-fonts.spec
@@ -2,12 +2,12 @@
%global fontconf 65-0-%{fontname}.conf
Name: %{fontname}-fonts
-Version: 2.4.5
-Release: 8%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
Summary: Free Tamil 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)
@@ -15,8 +15,6 @@ BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Patch1: bug-549319-578039.patch
-Patch2: bug-673419.patch
Obsoletes: lohit-fonts-common < %{version}-%{release}
%description
@@ -25,8 +23,6 @@ This package provides a free Tamil truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
-%patch1 -p1 -b .1-fix-font-conf
-%patch2 -p1 -b .2-fixed-punctuations-rupee-sign
mv 66-lohit-tamil.conf 65-0-lohit-tamil.conf
%build
@@ -53,10 +49,13 @@ 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
+* Mon Oct 10 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 1172c36..a42fd8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02c4b530a9f1c29355941d1958978f10 lohit-tamil-2.4.5.tar.gz
+7c01454163a2f6afd59888e0b05b65ba lohit-tamil-2.5.0.tar.gz
12 years, 6 months
[Fedora-i18n-bugs] [lohit-telugu-fonts] Upstream new release with relicensing to OFL
by Pravin Satpute
commit 0558cd494ae8b4eec8d4ea9163e81f5cfe4d8cd6
Author: प्रविण सातपुते <psatpute(a)redhat.com>
Date: Mon Oct 10 16:29:01 2011 +0530
Upstream new release with relicensing to OFL
.gitignore | 1 +
bug-549319-578040.patch | 12 -
bug-551317.patch | 1055 --------
bug-622682.patch | 6561 -----------------------------------------------
bug-673420.patch | 112 -
bug-692368.patch | 23 -
bug-714557.patch | 1113 --------
bug-714560.patch | 451 ----
bug-714561.patch | 812 ------
bug-714562.patch | 357 ---
bug-714563.patch | 6435 ----------------------------------------------
lohit-telugu-fonts.spec | 31 +-
sources | 2 +-
13 files changed, 9 insertions(+), 16956 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 77da9b4..b6b831b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
lohit-telugu-2.4.3.tar.gz
lohit-telugu-2.4.4.tar.gz
lohit-telugu-2.4.5.tar.gz
+/lohit-telugu-2.5.0.tar.gz
diff --git a/lohit-telugu-fonts.spec b/lohit-telugu-fonts.spec
index 14d4954..e61aa0a 100644
--- a/lohit-telugu-fonts.spec
+++ b/lohit-telugu-fonts.spec
@@ -2,12 +2,12 @@
%global fontconf 66-%{fontname}.conf
Name: %{fontname}-fonts
-Version: 2.4.5
-Release: 14%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
Summary: Free Telugu 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)
@@ -15,16 +15,6 @@ BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Patch1: bug-549319-578040.patch
-Patch2: bug-551317.patch
-Patch3: bug-622682.patch
-Patch4: bug-673420.patch
-Patch5: bug-692368.patch
-Patch6: bug-714562.patch
-Patch7: bug-714561.patch
-Patch8: bug-714563.patch
-Patch9: bug-714560.patch
-Patch10: bug-714557.patch
Obsoletes: lohit-fonts-common < %{version}-%{release}
%description
@@ -33,16 +23,6 @@ This package provides a free Telugu truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
-%patch1 -p1 -b .1-fix-font-conf
-%patch2 -p1 -b .2-added-hyphen
-%patch3 -p1 -b .3-characters-cut
-%patch4 -p1 -b .4-rupee-sign
-%patch5 -p1 -b .5-autohint-conf
-%patch6 -p1 -b .6-resolved-kra-issue
-%patch7 -p1 -b .7-fixed-positioning-rakar
-%patch8 -p1 -b .8-resolved-positioning-added-new-ligature
-%patch9 -p1 -b .9-resolved-merging-issue
-%patch10 -p1 -b .10-i-matra-stacking-properly
%build
make
@@ -68,10 +48,13 @@ 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
+* Mon Oct 10 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Wed Jul 27 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.4.5-14
- fixes bug 714557
diff --git a/sources b/sources
index eb5032f..520f6fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7b8d569773b56c2e218d22b60d22fd9 lohit-telugu-2.4.5.tar.gz
+e098fdec14094cd0393007f7f9210f72 lohit-telugu-2.5.0.tar.gz
12 years, 6 months
[Fedora-i18n-bugs] [lohit-tamil-fonts] Upstream new release with relicensing to OFL
by Pravin Satpute
commit 6f770fdacb86515f986a227afa90e0bbc71684a0
Author: प्रविण सातपुते <psatpute(a)redhat.com>
Date: Mon Oct 10 16:24:05 2011 +0530
Upstream new release with relicensing to OFL
.gitignore | 1 +
bug-549319-578039.patch | 12 ---
bug-673419.patch | 241 -----------------------------------------------
lohit-tamil-fonts.spec | 15 ++--
sources | 2 +-
5 files changed, 9 insertions(+), 262 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e30810..c725b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
lohit-tamil-2.4.3.tar.gz
lohit-tamil-2.4.4.tar.gz
lohit-tamil-2.4.5.tar.gz
+/lohit-tamil-2.5.0.tar.gz
diff --git a/lohit-tamil-fonts.spec b/lohit-tamil-fonts.spec
index b0923f9..b3d1aeb 100644
--- a/lohit-tamil-fonts.spec
+++ b/lohit-tamil-fonts.spec
@@ -2,12 +2,12 @@
%global fontconf 65-0-%{fontname}.conf
Name: %{fontname}-fonts
-Version: 2.4.5
-Release: 8%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
Summary: Free Tamil 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)
@@ -15,8 +15,6 @@ BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Patch1: bug-549319-578039.patch
-Patch2: bug-673419.patch
Obsoletes: lohit-fonts-common < %{version}-%{release}
%description
@@ -25,8 +23,6 @@ This package provides a free Tamil truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
-%patch1 -p1 -b .1-fix-font-conf
-%patch2 -p1 -b .2-fixed-punctuations-rupee-sign
mv 66-lohit-tamil.conf 65-0-lohit-tamil.conf
%build
@@ -53,10 +49,13 @@ 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
+* Mon Oct 10 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.4.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 1172c36..a42fd8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02c4b530a9f1c29355941d1958978f10 lohit-tamil-2.4.5.tar.gz
+7c01454163a2f6afd59888e0b05b65ba lohit-tamil-2.5.0.tar.gz
12 years, 6 months
[Fedora-i18n-bugs] [lohit-punjabi-fonts/f16] Upstream new release with relicensing to OFL
by Pravin Satpute
commit 3dcc82dc611287595f3afba2e25d49df8f0c6b87
Author: प्रविण सातपुते <psatpute(a)redhat.com>
Date: Mon Oct 10 16:04:18 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> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Wed Apr 13 2011 Pravin Satpute <psatpute(a)redhat.com> - 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
12 years, 6 months
[Fedora-i18n-bugs] [lohit-punjabi-fonts] Upstream new release with relicensing to OFL
by Pravin Satpute
commit a9b1233c87ecd1285a6136d953e09a21e9783c04
Author: प्रविण सातपुते <psatpute(a)redhat.com>
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> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Wed Apr 13 2011 Pravin Satpute <psatpute(a)redhat.com> - 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
12 years, 6 months
[Fedora-i18n-bugs] [lohit-oriya-fonts/f16] Upstream new release with relicensing to OFL
by Pravin Satpute
commit ee5a5f2c52b406c22ad64d229fef11e9d1094686
Author: प्रविण सातपुते <psatpute(a)redhat.com>
Date: Mon Oct 10 15:36:47 2011 +0530
Upstream new release with relicensing to OFL
.gitignore | 1 +
bug-549319-578037.patch | 12 -
bug-623995.patch | 925 -----------------------------------------------
bug-639977.patch | 11 -
bug-673417.patch | 69 ----
bug-692364.patch | 13 +-
lohit-oriya-fonts.spec | 23 +-
sources | 2 +-
8 files changed, 20 insertions(+), 1036 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63c3692..c0c6986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
lohit-oriya-2.4.3.tar.gz
+/lohit-oriya-2.5.0.tar.gz
diff --git a/bug-692364.patch b/bug-692364.patch
index ced981b..be327bb 100644
--- a/bug-692364.patch
+++ b/bug-692364.patch
@@ -1,7 +1,12 @@
-diff -rup lohit-oriya-2.4.3/66-lohit-oriya.conf lohit-oriya-2.4.3_mod/66-lohit-oriya.conf
---- lohit-oriya-2.4.3/66-lohit-oriya.conf 2011-04-13 11:27:38.851209407 +0530
-+++ lohit-oriya-2.4.3_mod/66-lohit-oriya.conf 2011-04-13 11:27:28.236752282 +0530
-@@ -12,6 +12,14 @@
+diff -rup lohit-oriya-2.5.0/66-lohit-oriya.conf lohit-oriya-2.5.0_mod/66-lohit-oriya.conf
+--- lohit-oriya-2.5.0/66-lohit-oriya.conf 2011-09-21 16:35:13.000000000 +0530
++++ lohit-oriya-2.5.0_mod/66-lohit-oriya.conf 2011-10-10 15:19:09.148243580 +0530
+@@ -8,10 +8,18 @@
+ <test name="family">
+ <string>sans-serif</string>
+ </test>
+- <edit name="family" mode="prepend" binding="same">
++ <edit name="family" mode="prepend">
<string>Lohit Oriya</string>
</edit>
</match>
diff --git a/lohit-oriya-fonts.spec b/lohit-oriya-fonts.spec
index 1f26b88..6010bf4 100644
--- a/lohit-oriya-fonts.spec
+++ b/lohit-oriya-fonts.spec
@@ -2,25 +2,21 @@
%global fontconf 66-%{fontname}.conf
Name: %{fontname}-fonts
-Version: 2.4.3
-Release: 9%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
Summary: Free Oriya Font
Group: User Interface/X
-License: GPLv2 with exceptions
+License: OFL
URL: https://fedorahosted.org/lohit/
-Source0: http://pravins.fedorapeople.org/lohit/oriya/%{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-578037.patch
-Patch2: bug-623995.patch
-Patch3: bug-639977.patch
-Patch4: bug-673417.patch
-Patch5: bug-692364.patch
Obsoletes: lohit-fonts-common < %{version}-%{release}
+Patch1: bug-692364.patch
%description
This package provides a free Oriya truetype/opentype font.
@@ -29,10 +25,6 @@ This package provides a free Oriya truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
%patch1 -p1 -b .1-fix-font-conf
-%patch2 -p1 -b .2-fix-for-qt
-%patch3 -p1 -b .3-added-akhn-ligature-gsub
-%patch4 -p1 -b .4-added-rupee
-%patch5 -p1 -b .5-autohint-conf
%build
./generate.pe *.sfd
@@ -58,10 +50,13 @@ 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
+* Mon Oct 10 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Wed Apr 13 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.4.3-9
- Resolved bug 692364
diff --git a/sources b/sources
index 89988f5..2df29f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b8118576e8ca848ec6b6f13555d6832 lohit-oriya-2.4.3.tar.gz
+a1cf61b82e60167d5d4ac4e81b76ddbf lohit-oriya-2.5.0.tar.gz
12 years, 6 months
[Fedora-i18n-bugs] [lohit-oriya-fonts] Upstream new release with relicensing to OFL
by Pravin Satpute
commit f81b2460bd136a4fd9193daf1d9828077d28a1fb
Author: प्रविण सातपुते <psatpute(a)redhat.com>
Date: Mon Oct 10 15:29:32 2011 +0530
Upstream new release with relicensing to OFL
.gitignore | 1 +
bug-549319-578037.patch | 12 -
bug-623995.patch | 925 -----------------------------------------------
bug-639977.patch | 11 -
bug-673417.patch | 69 ----
bug-692364.patch | 13 +-
lohit-oriya-fonts.spec | 21 +-
sources | 2 +-
8 files changed, 19 insertions(+), 1035 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63c3692..c0c6986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
lohit-oriya-2.4.3.tar.gz
+/lohit-oriya-2.5.0.tar.gz
diff --git a/bug-692364.patch b/bug-692364.patch
index ced981b..be327bb 100644
--- a/bug-692364.patch
+++ b/bug-692364.patch
@@ -1,7 +1,12 @@
-diff -rup lohit-oriya-2.4.3/66-lohit-oriya.conf lohit-oriya-2.4.3_mod/66-lohit-oriya.conf
---- lohit-oriya-2.4.3/66-lohit-oriya.conf 2011-04-13 11:27:38.851209407 +0530
-+++ lohit-oriya-2.4.3_mod/66-lohit-oriya.conf 2011-04-13 11:27:28.236752282 +0530
-@@ -12,6 +12,14 @@
+diff -rup lohit-oriya-2.5.0/66-lohit-oriya.conf lohit-oriya-2.5.0_mod/66-lohit-oriya.conf
+--- lohit-oriya-2.5.0/66-lohit-oriya.conf 2011-09-21 16:35:13.000000000 +0530
++++ lohit-oriya-2.5.0_mod/66-lohit-oriya.conf 2011-10-10 15:19:09.148243580 +0530
+@@ -8,10 +8,18 @@
+ <test name="family">
+ <string>sans-serif</string>
+ </test>
+- <edit name="family" mode="prepend" binding="same">
++ <edit name="family" mode="prepend">
<string>Lohit Oriya</string>
</edit>
</match>
diff --git a/lohit-oriya-fonts.spec b/lohit-oriya-fonts.spec
index 1f26b88..e7b8d41 100644
--- a/lohit-oriya-fonts.spec
+++ b/lohit-oriya-fonts.spec
@@ -2,12 +2,12 @@
%global fontconf 66-%{fontname}.conf
Name: %{fontname}-fonts
-Version: 2.4.3
-Release: 9%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
Summary: Free Oriya Font
Group: User Interface/X
-License: GPLv2 with exceptions
+License: OFL
URL: https://fedorahosted.org/lohit/
Source0: http://pravins.fedorapeople.org/lohit/oriya/%{fontname}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -15,12 +15,8 @@ BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Patch1: bug-549319-578037.patch
-Patch2: bug-623995.patch
-Patch3: bug-639977.patch
-Patch4: bug-673417.patch
-Patch5: bug-692364.patch
Obsoletes: lohit-fonts-common < %{version}-%{release}
+Patch1: bug-692364.patch
%description
This package provides a free Oriya truetype/opentype font.
@@ -29,10 +25,6 @@ This package provides a free Oriya truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
%patch1 -p1 -b .1-fix-font-conf
-%patch2 -p1 -b .2-fix-for-qt
-%patch3 -p1 -b .3-added-akhn-ligature-gsub
-%patch4 -p1 -b .4-added-rupee
-%patch5 -p1 -b .5-autohint-conf
%build
./generate.pe *.sfd
@@ -58,10 +50,13 @@ 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
+* Mon Oct 10 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.5.0-1
+- Upstream new release with relicensing to OFL
+
* Wed Apr 13 2011 Pravin Satpute <psatpute(a)redhat.com> - 2.4.3-9
- Resolved bug 692364
diff --git a/sources b/sources
index 89988f5..2df29f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b8118576e8ca848ec6b6f13555d6832 lohit-oriya-2.4.3.tar.gz
+a1cf61b82e60167d5d4ac4e81b76ddbf lohit-oriya-2.5.0.tar.gz
12 years, 6 months