diff --git a/.gitignore b/.gitignore
index c83962d..9df4627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
NaskhBasic-3.0.tar.gz
/PakType-Naskh-Basic-3.1.tar.gz
+/PakType-Naskh-Basic-4.0.tar.gz
diff --git a/67-paktype-naskh-basic-farsi.conf b/67-paktype-naskh-basic-farsi.conf
deleted file mode 100644
index ee0126d..0000000
--- a/67-paktype-naskh-basic-farsi.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- fa-ir
-
-
- sans-serif
-
-
- PakType Nashk Basic Farsi
-
-
-
- PakType Nashk Basic Farsi
-
- sans-serif
-
-
-
diff --git a/67-paktype-naskh-basic-sa.conf b/67-paktype-naskh-basic-sa.conf
deleted file mode 100644
index 3146d1a..0000000
--- a/67-paktype-naskh-basic-sa.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
- pa-pk
-
-
- sans-serif
-
-
- PakType Naskh Basic SA
-
-
-
-
-
- ur-pk
-
-
- sans-serif
-
-
- PakType Naskh Basic SA
-
-
-
-
-
- ur-in
-
-
- sans-serif
-
-
- PakType Naskh Basic SA
-
-
-
-
- PakType Naskh Basic SA
-
- sans-serif
-
-
-
-
diff --git a/67-paktype-naskh-basic-sindhi.conf b/67-paktype-naskh-basic-sindhi.conf
deleted file mode 100644
index 82526ae..0000000
--- a/67-paktype-naskh-basic-sindhi.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- sd
-
-
- sans-serif
-
-
- PakType Nashk Basic Sindhi
-
-
-
- PakType Nashk Basic Sindhi
-
- sans-serif
-
-
-
diff --git a/67-paktype-naskh-basic-urdu.conf b/67-paktype-naskh-basic-urdu.conf
deleted file mode 100644
index 8d164a7..0000000
--- a/67-paktype-naskh-basic-urdu.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- ur-in
-
-
- sans-serif
-
-
- PakType Nashk Basic Urdu
-
-
-
-
- ur-pk
-
-
- sans-serif
-
-
- PakType Nashk Basic Urdu
-
-
-
-
-
- PakType Nashk Basic Urdu
-
- sans-serif
-
-
-
diff --git a/paktype-naskh-basic-fonts.spec b/paktype-naskh-basic-fonts.spec
index caf8fa3..9b9fd38 100644
--- a/paktype-naskh-basic-fonts.spec
+++ b/paktype-naskh-basic-fonts.spec
@@ -1,145 +1,60 @@
%global fontname paktype-naskh-basic
-%global fontconf 67-%{fontname}
+%global fontconf 67-paktype-naskh-basic
-# Common description
-%define common_desc \
+Name: %{fontname}-fonts
+Version: 4.0
+Release: 1%{?dist}
+Summary: Fonts for Arabic, Farsi, Urdu and Sindhi from PakType
+Group: User Interface/X
+License: GPLv2 with exceptions
+URL: https://sourceforge.net/projects/paktype/
+Source0: http://downloads.sourceforge.net/paktype/Individual-Release/PakType-Naskh-Basic-%{version}.tar.gz
+Source1: %{fontconf}.conf
+BuildArch: noarch
+BuildRequires: fontpackages-devel
+Requires: fontpackages-filesystem
+
+%description
The paktype-naskh-basic-fonts package contains fonts for the display of \
Arabic, Farsi, Urdu and Sindhi from PakType by Lateef Sagar.
-Name: %{fontname}-fonts
-Version: 3.1
-Release: 1%{?dist}
-License: GPLv2 with exceptions
-URL: https://sourceforge.net/projects/paktype/
-Source0: http://citylan.dl.sourceforge.net/project/paktype/Individual-Release/PakType-Naskh-Basic-3.1.tar.gz
-Source1: %{fontconf}-sa.conf
-Source2: %{fontconf}-sindhi.conf
-Source3: %{fontconf}-farsi.conf
-Source4: %{fontconf}-urdu.conf
-Source5: %{fontconf}.conf
-BuildArch: noarch
-BuildRequires: fontpackages-devel
-Requires: %{name}-common
-Group: User Interface/X
-Summary: Fonts for Arabic, Farsi, Urdu and Sindhi from PakType
-
-
-%description
-%common_desc
-
-%package common
-Summary: Common files for paktype-naskh fonts
-Group: User Interface/X
-Requires: fontpackages-filesystem
-%description common
-%common_desc
-
-
-%package -n %{fontname}-farsi-fonts
-Summary: Font for Farsi from PakType
-Group: User Interface/X
-Requires: %{name}-common = %{version}-%{release}
-%description -n %{fontname}-farsi-fonts
-%common_desc
-This package provides a free Farsi truetype/opentype font
-
-%_font_pkg -n farsi -f %{fontconf}-farsi.conf PakTypeNaskhBasicFarsi.ttf
-
-%package -n %{fontname}-sa-fonts
-Summary: Fonts for Arabic, Farsi, Urdu and Sindhi from PakType
-Group: User Interface/X
-Requires: %{name}-common = %{version}-%{release}
-%description -n %{fontname}-sa-fonts
-%common_desc
-
-%_font_pkg -n sa -f %{fontconf}-sa.conf PakTypeNaskhBasicSA.ttf
-
-%package -n %{fontname}-sindhi-fonts
-Summary: Font for Sindhi from PakType
-Group: User Interface/X
-Requires: %{name}-common = %{version}-%{release}
-%description -n %{fontname}-sindhi-fonts
-%common_desc
-This package provides a free Sindhi truetype/opentype font
-
-%_font_pkg -n sindhi -f %{fontconf}-sindhi.conf PakTypeNaskhBasicSindhi.ttf
-
-%package -n %{fontname}-urdu-fonts
-Summary: Font for Urdu from PakType
-Group: User Interface/X
-Requires: %{name}-common = %{version}-%{release}
-%description -n %{fontname}-urdu-fonts
-%common_desc
-This package provides a free Urdu truetype/opentype font
-
-%_font_pkg -n urdu -f %{fontconf}-urdu.conf PakTypeNaskhBasicUrdu.ttf
-
-%_font_pkg -f %{fontconf}.conf PakTypeNaskhBasic.ttf
-
%prep
%setup -q -c
rm -rf Code
-mv PakType\ Naskh\ Basic\ Farsi.ttf PakTypeNaskhBasicFarsi.ttf
+# get rid of the white space (' ')
mv PakType\ Naskh\ Basic.ttf PakTypeNaskhBasic.ttf
-mv PakType\ Naskh\ Basic\ SA.ttf PakTypeNaskhBasicSA.ttf
-mv PakType\ Naskh\ Basic\ Urdu.ttf PakTypeNaskhBasicUrdu.ttf
-mv PakType\ Naskh\ Basic\ Sindhi.ttf PakTypeNaskhBasicSindhi.ttf
-
-mv Features/PakType\ Naskh\ Basic\ Farsi\ Features.pdf PakTypeNaskhBasicFarsiFeatures.pdf
-mv Features/PakType\ Naskh\ Basic\ Features.pdf PakTypeNaskhBasicFeatures.pdf
-mv Features/PakType\ Naskh\ Basic\ SA\ Features.pdf PakTypeNaskhBasicSAFeatures.pdf
-mv Features/PakType\ Naskh\ Basic\ Sindhi\ Features.pdf PakTypeNaskhBasicSindhiFeatures.pdf
-mv Features/PakType\ Naskh\ Basic\ Urdu\ Features.pdf PakTypeNaskhBasicUrduFeatures.pdf
-
+mv PakType\ Naskh\ Basic\ Features.pdf PakTypeNaskhBasicFeatures.pdf
mv PakType\ Naskh\ Basic\ License.txt PakType_Naskh_Basic_License.txt
+
%{__sed} -i 's/\r//' PakType_Naskh_Basic_License.txt
-chmod a-x PakTypeNaskhBasicFarsiFeatures.pdf PakType_Naskh_Basic_License.txt PakTypeNaskhBasicSindhiFeatures.pdf PakTypeNaskhBasicFeatures.pdf PakTypeNaskhBasicSAFeatures.pdf PakTypeNaskhBasicUrduFeatures.pdf
+chmod a-x PakType_Naskh_Basic_License.txt PakTypeNaskhBasicFeatures.pdf
+
+
%build
echo "Nothing to do in Build."
%install
-rm -rf $RPM_BUILD_ROOT
install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
-install -m 0644 -p PakTypeNaskhBasicFarsi.ttf PakTypeNaskhBasic.ttf PakTypeNaskhBasicSA.ttf PakTypeNaskhBasicUrdu.ttf PakTypeNaskhBasicSindhi.ttf $RPM_BUILD_ROOT%{_fontdir}
+install -m 0644 -p PakTypeNaskhBasic.ttf $RPM_BUILD_ROOT%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
- %{buildroot}%{_fontconfig_confdir}
+ %{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sa.conf
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+ln -s %{_fontconfig_templatedir}/%{fontconf}.conf \
+ %{buildroot}%{_fontconfig_confdir}/%{fontconf}.conf
-install -m 0644 -p %{SOURCE2} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sindhi.conf
-
-install -m 0644 -p %{SOURCE3} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-farsi.conf
-
-
-install -m 0644 -p %{SOURCE4} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-urdu.conf
-
-install -m 0644 -p %{SOURCE5} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
-
-
-for fconf in %{fontconf}-sa.conf \
- %{fontconf}-sindhi.conf \
- %{fontconf}-farsi.conf \
- %{fontconf}-urdu.conf \
- %{fontconf}.conf ; do
- ln -s %{_fontconfig_templatedir}/$fconf \
- %{buildroot}%{_fontconfig_confdir}/$fconf
-done
-
-%files common
-%defattr(-,root,root,-)
-%dir %{_fontdir}
-%doc PakType_Naskh_Basic_License.txt PakTypeNaskhBasicFarsiFeatures.pdf PakTypeNaskhBasicFeatures.pdf PakTypeNaskhBasicSAFeatures.pdf PakTypeNaskhBasicUrduFeatures.pdf PakTypeNaskhBasicSindhiFeatures.pdf
+%_font_pkg -f %{fontconf}.conf PakTypeNaskhBasic.ttf
+%doc PakType_Naskh_Basic_License.txt PakTypeNaskhBasicFeatures.pdf
%changelog
+* Wed Nov 21 2012 Pravin Satpute - 4.0-1
+- Upstream 4.0 release. Now no language specific ttf
+
* Mon Sep 03 2012 Naveen Kumar - 3.1-1
- Upstream 3.1 release
@@ -185,3 +100,5 @@ done
* Mon Feb 15 2010 Naveen Kumar - 3.0-1
- Initial packaging for version-3.0
+
+
diff --git a/sources b/sources
index 880a397..f93e3d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41c300c722f2dd80d2b04588a325a144 PakType-Naskh-Basic-3.1.tar.gz
+1985180ca189000a426514807061b3d9 PakType-Naskh-Basic-4.0.tar.gz