diff --git a/.cvsignore b/.cvsignore
index 4971718..b6921a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dejavu-sfd-20071025-2022.tar.bz2
+dejavu-sfd-20071027-2023.tar.bz2
diff --git a/dejavu-fonts-experimental-fontconfig-unhint-small.conf b/dejavu-fonts-experimental-fontconfig-unhint-small.conf
deleted file mode 100644
index 3fcc28b..0000000
--- a/dejavu-fonts-experimental-fontconfig-unhint-small.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
- DejaVu Sans Condensed
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu Serif Condensed
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu Sans Mono Condensed
-
-
- 7.5
-
-
- false
-
-
-
diff --git a/dejavu-fonts-experimental-fontconfig.conf b/dejavu-fonts-experimental-fontconfig.conf
deleted file mode 100644
index 3ac5203..0000000
--- a/dejavu-fonts-experimental-fontconfig.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
- DejaVu LGC Sans Condensed
-
-
- DejaVu Sans Condensed
-
-
-
-
- Toga Sans
-
-
- DejaVu Sans Condensed
-
-
-
-
- DejaVu LGC Serif Condensed
-
-
- DejaVu Serif Condensed
-
-
-
-
- Toga Serif
-
-
- DejaVu Serif Condensed
-
-
-
-
- sans-serif
-
- DejaVu Sans Condensed
-
-
-
- serif
-
- DejaVu Serif Condensed
-
-
-
diff --git a/dejavu-fonts-fontconfig-unhint-small.conf b/dejavu-fonts-fontconfig-unhint-small.conf
deleted file mode 100644
index dfa7aaa..0000000
--- a/dejavu-fonts-fontconfig-unhint-small.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
- DejaVu Sans
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu Serif
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu Sans Mono
-
-
- 7.5
-
-
- false
-
-
-
diff --git a/dejavu-fonts-fontconfig.conf b/dejavu-fonts-fontconfig.conf
deleted file mode 100644
index 2d960ee..0000000
--- a/dejavu-fonts-fontconfig.conf
+++ /dev/null
@@ -1,241 +0,0 @@
-
-
-
-
-
-
-
- Bitstream Prima Sans
-
-
- DejaVu Sans
-
-
-
-
- Bitstream Vera Sans
-
-
- DejaVu Sans
-
-
-
-
- DejaVu LGC Sans
-
-
- DejaVu Sans
-
-
-
-
- Arev Sans
-
-
- DejaVu Sans
-
-
-
-
- SUSE Sans
-
-
- DejaVu Sans
-
-
-
-
- Hunky Sans
-
-
- DejaVu Sans
-
-
-
-
- Verajja
-
-
- DejaVu Sans
-
-
-
-
-
- VerajjaPDA
-
-
- DejaVu Sans
-
-
-
-
- Bepa
-
-
- DejaVu Sans
-
-
-
-
- Olwen Sans
-
-
- DejaVu Sans
-
-
-
-
-
- Bitstream Prima Serif
-
-
- DejaVu Serif
-
-
-
-
- Bitstream Vera Serif
-
-
- DejaVu Serif
-
-
-
-
- DejaVu LGC Serif
-
-
- DejaVu Serif
-
-
-
-
- SUSE Serif
-
-
- DejaVu Serif
-
-
-
-
- Hunky Serif
-
-
- DejaVu Serif
-
-
-
-
-
- Verajja Serif
-
-
- DejaVu Serif
-
-
-
-
- Olwen Serif
-
-
- DejaVu Serif
-
-
-
-
-
- Bitstream Prima Sans Mono
-
-
- DejaVu Sans Mono
-
-
-
-
- Bitstream Vera Sans Mono
-
-
- DejaVu Sans Mono
-
-
-
-
- DejaVu LGC Sans Mono
-
-
- DejaVu Sans Mono
-
-
-
-
- SUSE Sans Mono
-
-
- DejaVu Sans Mono
-
-
-
-
- Bepa Mono
-
-
- DejaVu Sans Mono
-
-
-
-
- Olwen Sans Mono
-
-
- DejaVu Sans Mono
-
-
-
-
- DejaVu Sans
-
- sans-serif
-
-
-
- DejaVu Serif
-
- serif
-
-
-
- DejaVu Sans Mono
-
- monospace
-
-
-
-
- sans-serif
-
- DejaVu Sans
-
-
-
- serif
-
- DejaVu Serif
-
-
-
- monospace
-
- DejaVu Sans Mono
-
-
-
diff --git a/dejavu-fonts-lgc-fontconfig-unhint-small.conf b/dejavu-fonts-lgc-fontconfig-unhint-small.conf
deleted file mode 100644
index e702bec..0000000
--- a/dejavu-fonts-lgc-fontconfig-unhint-small.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
- DejaVu LGC Sans
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu LGC Serif
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu LGC Sans Mono
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu LGC Sans Condensed
-
-
- 7.5
-
-
- false
-
-
-
-
- DejaVu LGC Serif Condensed
-
-
- 7.5
-
-
- false
-
-
-
diff --git a/dejavu-fonts-lgc-fontconfig.conf b/dejavu-fonts-lgc-fontconfig.conf
deleted file mode 100644
index 0d9ef01..0000000
--- a/dejavu-fonts-lgc-fontconfig.conf
+++ /dev/null
@@ -1,276 +0,0 @@
-
-
-
-
-
-
-
- Bitstream Prima Sans
-
-
- DejaVu LGC Sans
-
-
-
-
- Bitstream Vera Sans
-
-
- DejaVu LGC Sans
-
-
-
-
- DejaVu Sans
-
-
- DejaVu LGC Sans
-
-
-
-
- Arev Sans
-
-
- DejaVu LGC Sans
-
-
-
-
- SUSE Sans
-
-
- DejaVu LGC Sans
-
-
-
-
- Hunky Sans
-
-
- DejaVu LGC Sans
-
-
-
-
- Verajja
-
-
- DejaVu LGC Sans
-
-
-
-
-
- VerajjaPDA
-
-
- DejaVu LGC Sans
-
-
-
-
- Bepa
-
-
- DejaVu LGC Sans
-
-
-
-
- Olwen Sans
-
-
- DejaVu LGC Sans
-
-
-
-
-
- Bitstream Prima Serif
-
-
- DejaVu LGC Serif
-
-
-
-
- Bitstream Vera Serif
-
-
- DejaVu LGC Serif
-
-
-
-
- DejaVu Serif
-
-
- DejaVu LGC Serif
-
-
-
-
- SUSE Serif
-
-
- DejaVu LGC Serif
-
-
-
-
- Hunky Serif
-
-
- DejaVu LGC Serif
-
-
-
-
-
- Verajja Serif
-
-
- DejaVu LGC Serif
-
-
-
-
- Olwen Serif
-
-
- DejaVu LGC Serif
-
-
-
-
-
- Bitstream Prima Sans Mono
-
-
- DejaVu LGC Sans Mono
-
-
-
-
- Bitstream Vera Sans Mono
-
-
- DejaVu LGC Sans Mono
-
-
-
-
- DejaVu Sans Mono
-
-
- DejaVu LGC Sans Mono
-
-
-
-
- SUSE Sans Mono
-
-
- DejaVu LGC Sans Mono
-
-
-
-
- Bepa Mono
-
-
- DejaVu LGC Sans Mono
-
-
-
-
- Olwen Sans Mono
-
-
- DejaVu LGC Sans Mono
-
-
-
-
-
- DejaVu Sans Condensed
-
-
- DejaVu LGC Sans Condensed
-
-
-
-
- Toga Sans
-
-
- DejaVu LGC Sans Condensed
-
-
-
-
- DejaVu Serif Condensed
-
-
- DejaVu LGC Serif Condensed
-
-
-
-
- Toga Serif
-
-
- DejaVu LGC Serif Condensed
-
-
-
-
- DejaVu LGC Sans
- DejaVu LGC Sans Condensed
-
- sans-serif
-
-
-
- DejaVu LGC Serif
- DejaVu LGC Serif Condensed
-
- serif
-
-
-
- DejaVu LGC Sans Mono
-
- monospace
-
-
-
-
- sans-serif
-
- DejaVu LGC Sans
-
-
-
- serif
-
- DejaVu LGC Serif
-
-
-
- monospace
-
- DejaVu LGC Sans Mono
-
-
-
diff --git a/dejavu-fonts.spec b/dejavu-fonts.spec
index 6eb4ac0..64dae67 100644
--- a/dejavu-fonts.spec
+++ b/dejavu-fonts.spec
@@ -4,10 +4,10 @@
%define archivename %{fontname}-sfd-%{archiveversion}
-%define alphatag .20071025svn2022
+%define alphatag .20071027svn2023
#define alphatag .rc1
-%define archiveversion 20071025-2022
+%define archiveversion 20071027-2023
#define archiveversion %{version}
@@ -17,7 +17,7 @@
Name: %{fontname}-fonts
Version: 2.21
-Release: 0.3%{?alphatag}%{?dist}
+Release: 0.4%{?alphatag}%{?dist}
Summary: DejaVu fonts, mature typefaces
Group: User Interface/X
@@ -25,16 +25,6 @@ License: Modifiable & redistributable, with naming restrictions
URL: http://%{fontname}.sf.net/
Source0: %{?!alphatag:http://prdownloads.sourceforge.net/%{fontname}}%{?alphatag:%{fontname}.sourceforge.net/snapshots}/%{archivename}.tar.bz2
-# DejaVu fontconfig setup
-Source1: %{name}-fontconfig.conf
-Source2: %{name}-fontconfig-unhint-small.conf
-# DejaVu fontconfig setup (experimental families)
-Source3: %{name}-experimental-fontconfig.conf
-Source4: %{name}-experimental-fontconfig-unhint-small.conf
-# DejaVu LGC setup
-Source5: %{name}-lgc-fontconfig.conf
-Source6: %{name}-lgc-fontconfig-unhint-small.conf
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Older fontforge versions will not work due to sfd format changes
BuildRequires: fontforge > 20070501
@@ -104,12 +94,7 @@ install -m 0644 -p build/*.ttf %{buildroot}%{fontdir}
# Fontconfig tweaks
install -m 0755 -d %{buildroot}%{fontconfdir}
-install -m 0644 -p %{SOURCE1} %{buildroot}%{fontconfdir}/57-%{fontname}.conf
-install -m 0644 -p %{SOURCE2} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}.conf
-install -m 0644 -p %{SOURCE3} %{buildroot}%{fontconfdir}/61-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE4} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-experimental.conf
-install -m 0644 -p %{SOURCE5} %{buildroot}%{fontconfdir}/58-%{fontname}-lgc.conf
-install -m 0644 -p %{SOURCE6} %{buildroot}%{fontconfdir}/20-unhint-small-%{fontname}-lgc.conf
+install -m 0644 -p fontconfig/*conf %{buildroot}%{fontconfdir}
%clean
@@ -199,9 +184,13 @@ fi
%changelog
+* Sat Oct 27 2007
+☺ 2.21-0.4.20071027svn2023
+ ✓ Fedora fontconfig files dropped (merged upstream)
+
* Wed Oct 25 2007
☺ 2.21-0.3.20071025svn2022
- ✓ Makefile patch dropped upstream
+ ✓ Makefile patch dropped (merged upstream)
✓ add -f to fc-cache calls
✓ completely align LGC and FULL fontconfig rules
✓ remove / from directory macros
diff --git a/sources b/sources
index 0511767..e6e8fb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6461152f93e7a0ea59b423bb343c8154 dejavu-sfd-20071025-2022.tar.bz2
+1666d279d7b9a4e7ded84e37d7edb21a dejavu-sfd-20071027-2023.tar.bz2