[datovka] Unbundled fonts
Jaroslav Škarvada
jskarvad at fedoraproject.org
Tue Oct 2 15:48:13 UTC 2012
commit 4f78a3cbf4643871a324fdaea743b5b4328038d8
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Tue Oct 2 17:48:06 2012 +0200
Unbundled fonts
datovka-2.1.2-use-sysfont.patch | 16 ++++++++++++++++
datovka.spec | 15 +++++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/datovka-2.1.2-use-sysfont.patch b/datovka-2.1.2-use-sysfont.patch
new file mode 100644
index 0000000..9408c7b
--- /dev/null
+++ b/datovka-2.1.2-use-sysfont.patch
@@ -0,0 +1,16 @@
+--- a/local.py.orig 2012-08-07 14:00:33.000000000 +0200
++++ b/local.py 2012-10-02 17:34:36.043206814 +0200
+@@ -39,6 +39,13 @@
+ path = os.path.join(env_path, name)
+ if os.path.isdir(path):
+ return path
++ # try dejavu system path for fonts
++ if name == "fonts":
++ fonts_path = os.path.join(sys.prefix, "share", "fonts", "dejavu")
++ if os.path.isdir(fonts_path):
++ return fonts_path
++ else:
++ dirs.append(icon_path)
+ # then try path relative to this file
+ local_path = os.path.join(local_dir, name)
+ if os.path.isdir(local_path):
diff --git a/datovka.spec b/datovka.spec
index f4de75f..51eab77 100644
--- a/datovka.spec
+++ b/datovka.spec
@@ -1,14 +1,16 @@
Name: datovka
Version: 2.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A free graphical interface for Czech Databox (Datové schránky)
Group: Applications/Communications
License: LGPLv2+
URL: http://labs.nic.cz/datove-schranky/
Source0: http://www.nic.cz/public_media/datove_schranky/releases/datovka-%{version}/src/%{name}-%{version}.tar.gz
+# use system font, sent upstream
+Patch0: datovka-2.1.2-use-sysfont.patch
BuildArch: noarch
Requires: python-dslib >= 2.0, python-reportlab, python-sqlalchemy
-Requires: pygtk2, python-pyasn1
+Requires: pygtk2, python-pyasn1, dejavu-sans-fonts
BuildRequires: python-setuptools, desktop-file-utils
%description
@@ -17,6 +19,8 @@ interface endorsed by the Czech government.
%prep
%setup -q
+%patch0 -p1 -b .use-sysfont
+
sed -i 's/Office/Office;/g' %{name}.desktop
%build
@@ -41,6 +45,10 @@ do
done
popd
+# remove fonts
+rm -f %{buildroot}%{_datadir}/%{name}/fonts/*
+rmdir %{buildroot}%{_datadir}/%{name}/fonts
+
%find_lang %{name}
%post
@@ -64,6 +72,9 @@ fi
%{_datadir}/icons/hicolor/*
%changelog
+* Tue Oct 2 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 2.1.2-3
+- Unbundled fonts
+
* Tue Sep 25 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 2.1.2-2
- Replaced some hardcoded paths by macros
More information about the scm-commits
mailing list