[xorg-x11-font-utils] Fix call to ttmkfdir (#967619)
by Peter Hutterer
commit 0a5cc9ef9a84a32b81144682603c53411743a139
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Thu May 30 15:52:02 2013 +1000
Fix call to ttmkfdir (#967619)
xorg-x11-font-utils.spec | 5 ++++-
xorg-x11-fonts-update-dirs | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec
index b7f1c3d..de4335d 100644
--- a/xorg-x11-font-utils.spec
+++ b/xorg-x11-font-utils.spec
@@ -6,7 +6,7 @@ Name: xorg-x11-%{pkgname}
# IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
Epoch: 1
Version: 7.5
-Release: 14%{?dist}
+Release: 15%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ucs2any.1*
%changelog
+* Thu May 30 2013 Peter Hutterer <peter.hutterer(a)redhat.com> 1:7.5-15
+- Fix call to ttmkfdir (#967619)
+
* Wed May 22 2013 Peter Hutterer <peter.hutterer(a)redhat.com> 1:7.5-14
- mkfontscale 1.1.0
- mkfontdir 1.0.7
diff --git a/xorg-x11-fonts-update-dirs b/xorg-x11-fonts-update-dirs
index 9d2725c..6d5fb2e 100755
--- a/xorg-x11-fonts-update-dirs
+++ b/xorg-x11-fonts-update-dirs
@@ -43,7 +43,7 @@ if [ "$skip_fontscale" != "yes" ]; then
mkfontscale $fontdir
fi
if [ "$need_ttmkfdir" = "yes" ]; then
- ttmkfdir $fontdir
+ ttmkfdir -d $fontdir -o "$fontdir/fonts.scale"
fi
mkfontdir $fontdir
11 years
[freetype/f19] Add aarch64 to 64 bit arch list
by Peter Robinson
commit 92114bde90568990bfad11a0ce63930fb90a8a41
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed May 29 14:54:27 2013 +0100
Add aarch64 to 64 bit arch list
freetype.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index d18dae1..8d7c720 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.4.11
-Release: 5%{?dist}
+Release: 6%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -136,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
# fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64 alpha sparc64
+%ifarch x86_64 s390x ia64 ppc64 alpha sparc64 aarch64
%define wordsize 64
%else
%define wordsize 32
@@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Wed May 29 2013 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.11-6
+- Add aarch64 to 64 bit arch list
+
* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.11-5
- Change encoding of "docs/tutorial/example3.cpp" to UTF-8
11 years
[freetype] Add aarch64 to 64 bit arch list
by Peter Robinson
commit 2282d315363a606d8b4ae953ae4578551f3c550b
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed May 29 14:41:26 2013 +0100
Add aarch64 to 64 bit arch list
freetype.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index bdd7e9f..2709d18 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.4.12
-Release: 4%{?dist}
+Release: 5%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -142,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
# fix multilib issues
-%ifarch x86_64 s390x ia64 ppc64 alpha sparc64
+%ifarch x86_64 s390x ia64 ppc64 alpha sparc64 aarch64
%define wordsize 64
%else
%define wordsize 32
@@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/tutorial
%changelog
+* Wed May 29 2013 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.4.12-5
+- Add aarch64 to 64 bit arch list
+
* Thu May 16 2013 Marek Kasik <mkasik(a)redhat.com> - 2.4.12-4
- Change encoding of "docs/tutorial/example3.cpp" to UTF-8
11 years
[lohit-bengali-fonts/f19] Resolved #959994 - Removed 'as' from fc-cache
by Pravin Satpute
commit 35208ac6fe7ae374f42f9e075b5b65c4fd059532
Author: pravins <psatpute(a)redhat.com>
Date: Wed May 29 14:51:16 2013 +0530
Resolved #959994 - Removed 'as' from fc-cache
bug-959994.patch | 25 +++++++++++++++++++++++++
lohit-bengali-fonts.spec | 9 +++++++--
2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/bug-959994.patch b/bug-959994.patch
new file mode 100644
index 0000000..5dce5dd
--- /dev/null
+++ b/bug-959994.patch
@@ -0,0 +1,25 @@
+diff -rup lohit-bengali-2.5.3/65-0-lohit-bengali.conf lohit-bengali-2.5.3_mod/65-0-lohit-bengali.conf
+--- lohit-bengali-2.5.3/65-0-lohit-bengali.conf 2013-01-30 17:31:46.000000000 +0530
++++ lohit-bengali-2.5.3_mod/65-0-lohit-bengali.conf 2013-05-29 14:28:53.239651293 +0530
+@@ -22,6 +22,21 @@
+ </edit>
+ </match>
+
++ <match target="scan">
++ <test name="family">
++ <string>Lohit Bengali</string>
++ </test>
++ <edit name="lang" mode="assign">
++ <minus>
++ <name>lang</name>
++ <langset>
++ <string>as</string>
++ </langset>
++ </minus>
++ </edit>
++ </match>
++
++
+ <alias>
+ <family>Lohit Bengali</family>
+ <default>
diff --git a/lohit-bengali-fonts.spec b/lohit-bengali-fonts.spec
index 0810bdf..e0ee33b 100644
--- a/lohit-bengali-fonts.spec
+++ b/lohit-bengali-fonts.spec
@@ -3,7 +3,7 @@
Name: %{fontname}-fonts
Version: 2.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Free Bengali font
Group: User Interface/X
License: OFL
@@ -13,7 +13,8 @@ BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Obsoletes: lohit-fonts-common < %{version}-%{release}
+Patch1: bug-959994.patch
+
%description
This package provides a free Bengali truetype/opentype font.
@@ -22,6 +23,7 @@ This package provides a free Bengali truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
mv 66-%{fontname}.conf 65-0-lohit-bengali.conf
+%patch1 -p1 -b .1-removing-as-from-fc-cache
%build
@@ -47,6 +49,9 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
%changelog
+* Wed May 29 2013 Pravin Satpute <psatpute(a)redhat.com> - 2.5.3-3
+- Resolved #959994 - Removed 'as' from fc-cache
+
* Fri Apr 12 2013 Pravin Satpute <psatpute(a)redhat.com> - 2.5.3-2
- Resolved #950523
11 years
[lohit-bengali-fonts] Resolved #959994 - Removed 'as' from fc-cache
by Pravin Satpute
commit c572f5bf860bc21b42576a030bce2a3a42b38047
Author: pravins <psatpute(a)redhat.com>
Date: Wed May 29 14:44:46 2013 +0530
Resolved #959994 - Removed 'as' from fc-cache
bug-959994.patch | 25 +++++++++++++++++++++++++
lohit-bengali-fonts.spec | 9 +++++++--
2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/bug-959994.patch b/bug-959994.patch
new file mode 100644
index 0000000..5dce5dd
--- /dev/null
+++ b/bug-959994.patch
@@ -0,0 +1,25 @@
+diff -rup lohit-bengali-2.5.3/65-0-lohit-bengali.conf lohit-bengali-2.5.3_mod/65-0-lohit-bengali.conf
+--- lohit-bengali-2.5.3/65-0-lohit-bengali.conf 2013-01-30 17:31:46.000000000 +0530
++++ lohit-bengali-2.5.3_mod/65-0-lohit-bengali.conf 2013-05-29 14:28:53.239651293 +0530
+@@ -22,6 +22,21 @@
+ </edit>
+ </match>
+
++ <match target="scan">
++ <test name="family">
++ <string>Lohit Bengali</string>
++ </test>
++ <edit name="lang" mode="assign">
++ <minus>
++ <name>lang</name>
++ <langset>
++ <string>as</string>
++ </langset>
++ </minus>
++ </edit>
++ </match>
++
++
+ <alias>
+ <family>Lohit Bengali</family>
+ <default>
diff --git a/lohit-bengali-fonts.spec b/lohit-bengali-fonts.spec
index 0810bdf..e0ee33b 100644
--- a/lohit-bengali-fonts.spec
+++ b/lohit-bengali-fonts.spec
@@ -3,7 +3,7 @@
Name: %{fontname}-fonts
Version: 2.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Free Bengali font
Group: User Interface/X
License: OFL
@@ -13,7 +13,8 @@ BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
-Obsoletes: lohit-fonts-common < %{version}-%{release}
+Patch1: bug-959994.patch
+
%description
This package provides a free Bengali truetype/opentype font.
@@ -22,6 +23,7 @@ This package provides a free Bengali truetype/opentype font.
%prep
%setup -q -n %{fontname}-%{version}
mv 66-%{fontname}.conf 65-0-lohit-bengali.conf
+%patch1 -p1 -b .1-removing-as-from-fc-cache
%build
@@ -47,6 +49,9 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
%changelog
+* Wed May 29 2013 Pravin Satpute <psatpute(a)redhat.com> - 2.5.3-3
+- Resolved #959994 - Removed 'as' from fc-cache
+
* Fri Apr 12 2013 Pravin Satpute <psatpute(a)redhat.com> - 2.5.3-2
- Resolved #950523
11 years
