commit 859fb69a90d9b8b878317292bc445b7ee664e507
Author: Pravin Satpute <psatp...@redhat.com>
Date:   Mon Apr 28 15:16:18 2014 +0530

    Resolved bug #1040288 - Changed name from Oriya to Odia

 67-samyak-oriya.conf => 67-samyak-odia.conf |    4 +-
 bug-1040288.patch                           |   14 ++++++++++++
 samyak-fonts.spec                           |   30 +++++++++++++++++---------
 3 files changed, 35 insertions(+), 13 deletions(-)
---
diff --git a/67-samyak-oriya.conf b/67-samyak-odia.conf
similarity index 84%
rename from 67-samyak-oriya.conf
rename to 67-samyak-odia.conf
index 01e8525..e444523 100644
--- a/67-samyak-oriya.conf
+++ b/67-samyak-odia.conf
@@ -9,11 +9,11 @@
     <string>serif</string>
   </test>
   <edit name="family" mode="prepend">
-    <string>Samyak Oriya</string>
+    <string>Samyak Odia</string>
   </edit>
 </match>
 <alias>
-  <family>Samyak Oriya</family>
+  <family>Samyak Odia</family>
   <default>
     <family>serif</family>
   </default>
diff --git a/bug-1040288.patch b/bug-1040288.patch
new file mode 100644
index 0000000..4737af9
--- /dev/null
+++ b/bug-1040288.patch
@@ -0,0 +1,14 @@
+diff -rup samyak-fonts-1.2.2/oriya/Samyak_Oriya.sfd 
samyak-fonts-1.2.2_mod/oriya/Samyak_Oriya.sfd
+--- samyak-fonts-1.2.2/oriya/Samyak_Oriya.sfd  2010-06-10 14:40:24.000000000 
+0530
++++ samyak-fonts-1.2.2_mod/oriya/Samyak_Oriya.sfd      2014-04-28 
12:53:45.510897337 +0530
+@@ -1,7 +1,7 @@
+ SplineFontDB: 3.0
+-FontName: Samyak-Oriya
+-FullName: Samyak Oriya
+-FamilyName: Samyak Oriya
++FontName: Samyak-Odia
++FullName: Samyak Odia
++FamilyName: Samyak Odia
+ Weight: Medium
+ Copyright: Created by:\nRahul Bhalerao <b.rahul...@gmail.com>, \nSandeep 
Shedmake <sandeep.shedm...@gmail.com>, \nBageshri Salvi <sbages...@gmail.com>, 
\nPravin Satpute <pravin....@gmail.com>\n\nGNU GPL V.3 or later (with Font 
Exception), Copyright `2005-2006 by  H.B.C.S.E., T.I.F.R.,\nHomi Bhabha Centre 
For Science Education, \nTata Institute Of Fundamental Research,\nV.N. Purav 
Marg, Mankhurd, \nMumbai 400 088, INDIA.\n\nAs a special exception, if you 
create a document which uses this font, and embed this font or unaltered 
portions of this font into the document, this font does not by itself cause the 
resulting document to be covered by the GNU General Public License. This 
exception does not however invalidate any other reasons why the document might 
be covered by the GNU General Public License. If you modify this font, you may 
extend this exception to your version of the font, but you are not obligated to 
do so. If you do not wish to do so, delete this exception statemen
 t from your version.  \n\nFor detailed license see: \nwww.gnu.org 
and\nhttp://www.gnu.org/licenses/gpl-faq.html#FontException\n\nFurther info 
:http://sarovar.org/projects/samyak/\nwww.gnowledge.org\n\nCONTACTS:\nNagarjuna 
G.\nEmail:nagar...@gnowledge.org
+ Version: 1.2.2
diff --git a/samyak-fonts.spec b/samyak-fonts.spec
index 19581c4..5b086de 100644
--- a/samyak-fonts.spec
+++ b/samyak-fonts.spec
@@ -4,11 +4,11 @@
 # Common description
 %global common_desc \
 The Samyak package contains fonts for the display of \
-Scripts Devanagari, Gujarati, Malayalam, Oriya and Tamil
+Scripts Devanagari, Gujarati, Malayalam, Odia and Tamil
 
 Name:   %{fontname}-fonts
 Version:       1.2.2
-Release:       11%{?dist}
+Release:       12%{?dist}
 Summary:       Free Indian truetype/opentype fonts
 Group: User Interface/X
 License:       GPLv3+ with exceptions
@@ -19,10 +19,11 @@ Source1: 66-samyak-devanagari.conf
 Source2: 67-samyak-tamil.conf
 Source3: 68-samyak-malayalam.conf
 Source4: 67-samyak-gujarati.conf
-Source5: 67-samyak-oriya.conf
+Source5: 67-samyak-odia.conf
 BuildArch:     noarch
 BuildRequires: fontpackages-devel
 BuildRequires: fontforge >= 20080429
+Patch1: bug-1040288.patch
 
 %description
 %common_desc
@@ -78,20 +79,24 @@ Scripts Gujarati.
 
 %_font_pkg -n gujarati -f %{fontconf}-gujarati.conf Samyak-Gujarati.ttf 
 
-%package -n %{fontname}-oriya-fonts
-Summary: Open Type Fonts for Oriya script
+%package -n %{fontname}-odia-fonts
+Summary: Open Type Fonts for Odia script
 Group: User Interface/X 
 Requires: %{name}-common = %{version}-%{release}
 License: GPLv3+ with exceptions
-%description -n %{fontname}-oriya-fonts
+Provides:      %{fontname}-oriya-fonts = %{version}-%{release}
+Obsoletes:     %{fontname}-oriya-fonts < 1.2.2-12
+%description -n %{fontname}-odia-fonts
 This package contains truetype/opentype font for the display of \
-Scripts Oriya.
+Scripts Odia.
 
-%_font_pkg -n oriya -f %{fontconf}-oriya.conf Samyak-Oriya.ttf 
+%_font_pkg -n odia -f %{fontconf}-odia.conf Samyak-Odia.ttf 
 
 
 %prep
 %setup -q -n samyak-fonts-%{version}
+%patch1 -p1 -b .1-change-name-from-oriya-to-odia
+
 
 %build
 mkdir -p TTFfiles/
@@ -118,14 +123,14 @@ install -m 0644 -p %{SOURCE4} \
        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-gujarati.conf
 
 install -m 0644 -p %{SOURCE5} \
-       %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-oriya.conf
+       %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-odia.conf
 
 
 for fconf in 66-samyak-devanagari.conf \
                %{fontconf}-tamil.conf \
                68-samyak-malayalam.conf \
                %{fontconf}-gujarati.conf \
-               %{fontconf}-oriya.conf ; do
+               %{fontconf}-odia.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -137,6 +142,9 @@ done
 %dir %{_fontdir}
 
 %changelog
+* Mon Apr 28 2014 Pravin Satpute <psatp...@redhat.com> 1.2.2-12
+- Resolved bug #1040288 - Changed name from Oriya to Odia
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-...@lists.fedoraproject.org> 
- 1.2.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -174,7 +182,7 @@ done
 * Tue May 4 2010 Naveen Kumar <nku...@redhat.com> 1.2.1-10
 - remove binding="same" from all .conf files
 
-* Thu Mar 23 2010 Naveen Kumar <nku...@redhat.com> 1.2.1-9
+* Tue Mar 23 2010 Naveen Kumar <nku...@redhat.com> 1.2.1-9
 - corrected ne-IN to ne-np in 67-samyak-devanagari.conf
 
 * Wed Mar 3 2010 Naveen Kumar <nku...@redhat.com> 1.2.1-8
_______________________________________________
fonts-bugs mailing list
fonts-bugs@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs
http://fonts.fedoraproject.org/

Reply via email to