rpms/dejavu-fonts/devel .cvsignore, 1.41, 1.42 dejavu-fonts.spec, 1.71, 1.72 sources, 1.41, 1.42 dejavu-fonts-experimental-fontconfig-unhint-small.conf, 1.1, NONE dejavu-fonts-experimental-fontconfig.conf, 1.7, NONE dejavu-fonts-fontconfig-unhint-small.conf, 1.1, NONE dejavu-fonts-fontconfig.conf, 1.8, NONE dejavu-fonts-lgc-fontconfig-unhint-small.conf, 1.2, NONE dejavu-fonts-lgc-fontconfig.conf, 1.3, NONE

Nicolas Mailhot (nim) fedora-extras-commits at redhat.com
Sat Oct 27 09:27:30 UTC 2007


Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26346/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Removed Files:
	dejavu-fonts-experimental-fontconfig-unhint-small.conf 
	dejavu-fonts-experimental-fontconfig.conf 
	dejavu-fonts-fontconfig-unhint-small.conf 
	dejavu-fonts-fontconfig.conf 
	dejavu-fonts-lgc-fontconfig-unhint-small.conf 
	dejavu-fonts-lgc-fontconfig.conf 
Log Message:
more cleanups


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	25 Oct 2007 18:31:44 -0000	1.41
+++ .cvsignore	27 Oct 2007 09:26:57 -0000	1.42
@@ -1 +1 @@
-dejavu-sfd-20071025-2022.tar.bz2
+dejavu-sfd-20071027-2023.tar.bz2


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- dejavu-fonts.spec	25 Oct 2007 18:31:44 -0000	1.71
+++ dejavu-fonts.spec	27 Oct 2007 09:26:57 -0000	1.72
@@ -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 @@
 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 @@
 
 # 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 @@
 
 
 %changelog
+* Sat Oct 27 2007 <nicolas.mailhot at laposte.net>
+☺ 2.21-0.4.20071027svn2023
+ ✓ Fedora fontconfig files dropped (merged upstream)
+
 * Wed Oct 25 2007 <nicolas.mailhot at laposte.net>
 ☺ 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	25 Oct 2007 18:31:44 -0000	1.41
+++ sources	27 Oct 2007 09:26:57 -0000	1.42
@@ -1 +1 @@
-6461152f93e7a0ea59b423bb343c8154  dejavu-sfd-20071025-2022.tar.bz2
+1666d279d7b9a4e7ded84e37d7edb21a  dejavu-sfd-20071027-2023.tar.bz2


--- dejavu-fonts-experimental-fontconfig-unhint-small.conf DELETED ---


--- dejavu-fonts-experimental-fontconfig.conf DELETED ---


--- dejavu-fonts-fontconfig-unhint-small.conf DELETED ---


--- dejavu-fonts-fontconfig.conf DELETED ---


--- dejavu-fonts-lgc-fontconfig-unhint-small.conf DELETED ---


--- dejavu-fonts-lgc-fontconfig.conf DELETED ---




More information about the fedora-extras-commits mailing list