rpms/madan-fonts/F-13 65-madan.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 madan-fonts.spec, 1.6, 1.7 sources, 1.2, 1.3

[pnemade]

Author: pnemade

Update of /cvs/pkgs/rpms/madan-fonts/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9155

Modified Files:
	.cvsignore madan-fonts.spec sources 
Added Files:
	65-madan.conf 
Log Message:
* Tue Feb 23 2010 Parag <pnemade AT redhat.com> - 2.000-1
- Update to next upstream release
- Resolves: rh#335851-[ne_NP] Add license text file to madan-fonts package
- Resolves: rh#520047-[ne_NP] Need fontconfig rules for Madan font




--- NEW FILE 65-madan.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- font remapping/renaming overrides -->

  <match target="scan">
    <test name="family">
      <string>Madan2</string>
    </test>
    <edit name="family">
      <string>Madan</string>
    </edit>
    <edit name="fullname">
      <string>Madan</string>
    </edit>
  </match>
  <alias binding="same">
    <family>Madan2</family>
    <accept>
      <family>Madan</family>
    </accept>
  </alias>

<!-- locale-specific overrides -->

<match>
  <test name="lang" compare="contains">
    <string>ne-np</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>Madan</string>
  </edit>
</match>

</fontconfig>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/madan-fonts/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Oct 2007 15:57:59 -0000	1.2
+++ .cvsignore	23 Feb 2010 09:29:44 -0000	1.3
@@ -1 +1 @@
-Madan.ttf
+madan.zip


Index: madan-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/madan-fonts/F-13/madan-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- madan-fonts.spec	11 Aug 2009 07:04:21 -0000	1.6
+++ madan-fonts.spec	23 Feb 2010 09:29:44 -0000	1.7
@@ -1,16 +1,17 @@
-%define fontdir %{_datadir}/fonts/madan
-%define fontname madan
+%global fontname madan
+%global fontconf 65-%{fontname}.conf
 
 Name: %{fontname}-fonts
-Version: 1.0
-Release: 11%{?dist}
+Version: 2.000
+Release: 1%{?dist}
 Summary: Font for Nepali language
 Group: User Interface/X
-# No version specified.
 License: GPL+
-# upstream link is dead. While I work on new release lets fix this for now.
 URL: http://madanpuraskar.org/
-Source: Madan.ttf
+#Note if downloading this URL using wget,move this file to madan.zip
+#Source0: http://madanpuraskar.org/index.php?option=com_docman&task=doc_download&gid=8&Itemid=63
+Source0: madan.zip
+Source1: %{fontconf}
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fontpackages-devel
@@ -21,8 +22,13 @@ This package provides the Madan font for
 Madan Puraskar Pustakalaya project.
 
 %prep
-%setup -c -T
-cp -p %{SOURCE0} .
+%setup -c -q
+for file in madan/license.txt; do
+ sed "s|\r||g" $file > $file.new && \
+ touch -r $file $file.new && \
+ mv $file.new $file
+done
+
 
 %build
 echo "Nothing to do in Build."
@@ -30,15 +36,30 @@ echo "Nothing to do in Build."
 %install
 rm -rf %{buildroot}
 
-install -m 0755 -d %{buildroot}%{fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{fontdir}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p %{fontname}/*.ttf %{buildroot}%{_fontdir}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
 %clean
 rm -rf %{buildroot}
 
-%_font_pkg  *.ttf
+%_font_pkg -f %{fontconf} *.ttf
+%doc %{fontname}/license.txt
+
 
 %changelog
+* Tue Feb 23 2010 Parag <pnemade AT redhat.com> - 2.000-1
+- Update to next upstream release
+- Resolves: rh#335851-[ne_NP] Add license text file to madan-fonts package
+- Resolves: rh#520047-[ne_NP] Need fontconfig rules for Madan font
+
 * Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-11
 - Fix source audit 2009-08-10
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/madan-fonts/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Oct 2007 15:57:59 -0000	1.2
+++ sources	23 Feb 2010 09:29:44 -0000	1.3
@@ -1 +1 @@
-d78a34b1d46dcfa74ff64e78dcc1fc31  Madan.ttf
+8d1b035f8b2a90a0426df5f8fe2fe976  madan.zip