rpms/paktype-naqsh-fonts/devel 67-paktype-naqsh.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 paktype-naqsh-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 License.txt, 1.1, NONE

[Pravin Satpute]

Author: pravins

Update of /cvs/pkgs/rpms/paktype-naqsh-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22257

Modified Files:
	.cvsignore paktype-naqsh-fonts.spec sources 
Added Files:
	67-paktype-naqsh.conf 
Removed Files:
	License.txt 
Log Message:
 * Thu Mar 04 2010 Pravin Satpute <psatpute at redhat.com> - 3.0-2
 - upstream new release with license fix
 - added .conf file as well



--- NEW FILE 67-paktype-naqsh.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <alias>
    <family>sans-serif</family>
    <prefer>
      <family>PakType Naqsh</family>
    </prefer>
  </alias>
  <alias>
    <family>PakType Naqsh</family>
    <default>
      <family>sans-serif</family>
    </default>
  </alias>
</fontconfig>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/paktype-naqsh-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	8 Feb 2010 04:48:00 -0000	1.2
+++ .cvsignore	4 Mar 2010 07:17:42 -0000	1.3
@@ -1 +1,2 @@
 PakType_Naqsh.ttf
+Naqsh-3.0.tar.gz


Index: paktype-naqsh-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paktype-naqsh-fonts/devel/paktype-naqsh-fonts.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- paktype-naqsh-fonts.spec	8 Feb 2010 04:48:00 -0000	1.1
+++ paktype-naqsh-fonts.spec	4 Mar 2010 07:17:42 -0000	1.2
@@ -1,19 +1,20 @@
 %define fontname paktype-naqsh
+%define fontconf 67-paktype
 %define fontdir %{_datadir}/fonts/%{fontname}
 
-Name:        %{fontname}-fonts
+Name:	%{fontname}-fonts
 Version:     3.0
-Release:     1%{?dist}
+Release:     2%{?dist}
 Summary:     Fonts for Arabic from PakType
 
-Group:       User Interface/X
+Group:	User Interface/X
 License:     GPLv2 with exceptions
-URL:         https://sourceforge.net/projects/paktype/
-Source0:     http://downloads.sourceforge.net/project/paktype/PakType%20Naqsh/3.0/PakType_Naqsh.ttf
-Source1:     https://paktype.svn.sourceforge.net/svnroot/paktype/Fonts/Naqsh/License.txt
+URL:	https://sourceforge.net/projects/paktype/
+Source0:     http://downloads.sourceforge.net/project/paktype/Naqsh-3.0.tar.gz
+Source1:	%{fontconf}-naqsh.conf
 BuildArch:   noarch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   fontpackages-devel
+BuildRequires:	fontpackages-devel
 Requires:   fontpackages-filesystem
 
 %description 
@@ -21,11 +22,20 @@ The paktype-naqsh-fonts package contains
 Arabic from the PakType by Lateef Sagar.
 
 %prep
-%setup -q -T -c
-cp -p %{SOURCE1} .
+%setup -q -c
+rm -rf Naqsh-3.0/Project\ files/
+# get rid of the white space (' ')
+mv Naqsh-3.0/Ready*/PakType\ Naqsh.ttf PakType_Naqsh.ttf
+mv Naqsh-3.0/License\ files/PakType\ Naqsh\ License.txt PakType_Naqsh_License.txt
 
-for txt in License.txt ; do
+%{__sed} -i 's/\r//' PakType_Naqsh_License.txt
+
+for txt in Naqsh-3.0/Readme.txt ; do
    fold -s $txt > $txt.new
+   sed -i 's/\x92//g' $txt.new
+   sed -i 's/\x93//g' $txt.new
+   sed -i 's/\x94//g' $txt.new
+   sed -i 's/\x96//g' $txt.new
    sed -i 's/\r//' $txt.new
    touch -r $txt $txt.new
    mv $txt.new $txt
@@ -37,16 +47,29 @@ echo "Nothing to do in Build."
 %install
 rm -rf $RPM_BUILD_ROOT
 install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir}
-install -m 0644 -p %{SOURCE0} $RPM_BUILD_ROOT%{_fontdir}
+install -m 0644 -p PakType_Naqsh.ttf $RPM_BUILD_ROOT%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+		%{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-naqsh.conf
+
+ln -s %{_fontconfig_templatedir}/%{fontconf}-naqsh.conf \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}-naqsh.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%_font_pkg PakType_Naqsh.ttf
+%_font_pkg -f %{fontconf}-naqsh.conf PakType_Naqsh.ttf
 
-%doc License.txt
+%doc PakType_Naqsh_License.txt Naqsh-3.0/Readme.txt
 
 %changelog
+* Thu Mar 04 2010 Pravin Satpute <psatpute at redhat.com> - 3.0-2
+- upstream new release with license fix
+- added .conf file as well
+
 * Fri Feb 05 2010 Pravin Satpute <psatpute at redhat.com> - 3.0-1
 - Initial build
 - Split from paktype fonts


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/paktype-naqsh-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Feb 2010 04:48:00 -0000	1.2
+++ sources	4 Mar 2010 07:17:42 -0000	1.3
@@ -1 +1 @@
-45bfc1b8773edbfe4993014bd8d83fbd  PakType_Naqsh.ttf
+8fbe43a931dea72e87a5b0807278e988  Naqsh-3.0.tar.gz


--- License.txt DELETED ---