rpms/fontconfig/devel 25-no-bitmap-fedora.conf, NONE, 1.1 .cvsignore, 1.27, 1.28 fontconfig.spec, 1.103, 1.104 sources, 1.28, 1.29 25-no-hint-fedora.conf, 1.1, NONE 30-aliases-fedora.conf, 1.5, NONE 40-generic-fedora.conf, 1.1, NONE 64-nonlatin-fedora.conf, 1.1, NONE 75-blacklist-fedora.conf, 1.1, NONE

[Behdad Esfahbod (behdad)]

Author: behdad

Update of /cvs/pkgs/rpms/fontconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731

Modified Files:
	.cvsignore fontconfig.spec sources 
Added Files:
	25-no-bitmap-fedora.conf 
Removed Files:
	25-no-hint-fedora.conf 30-aliases-fedora.conf 
	40-generic-fedora.conf 64-nonlatin-fedora.conf 
	75-blacklist-fedora.conf 
Log Message:
* Thu Oct 25 2007 Behdad Esfahbod <besfahbo at redhat.com> - 2.4.92-1
- Update to 2.4.92.
- Mark /etc/fonts/conf.d/* as config(noreplace).
- Remove most of our conf file, all upstreamed except for
  75-blacklist-fedora.conf that I'm happily dropping.  Who has
  Hershey fonts these days...
- ln upstream'ed 25-unhint-nonlatin.conf from conf.avail in conf.d
- Add 25-no-bitmap-fedora.conf which is the tiny remaining bit
  of conf that didn't end up upstream.  Can get rid of it in the
  future, but not just yet.




--- NEW FILE 25-no-bitmap-fedora.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
	<match target="font">
		<test name="family" compare="eq">
			<string>Kochi Mincho</string>
		</test>
		<edit name="embeddedbitmap" mode="assign">
			<bool>false</bool>
		</edit>
	</match>
	<match target="font">
		<test name="family" compare="eq">
			<string>Kochi Gothic</string>
		</test>
		<edit name="embeddedbitmap" mode="assign">
			<bool>false</bool>
		</edit>
	</match>
	<match target="font">
		<test name="family" compare="eq">
			<string>Sazanami Mincho</string>
		</test>
		<edit name="embeddedbitmap" mode="assign">
			<bool>false</bool>
		</edit>
	</match>
	<match target="font">
		<test name="family" compare="eq">
			<string>Sazanami Gothic</string>
		</test>
		<edit name="embeddedbitmap" mode="assign">
			<bool>false</bool>
		</edit>
	</match>
        <match target="font">
                <test name="family" compare="eq">
                        <string>AR PL ShanHeiSun Uni</string>
                </test>
                <edit name="embeddedbitmap" mode="assign">
                        <bool>true</bool>
                </edit>
        </match>
</fontconfig>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	26 Oct 2007 01:16:55 -0000	1.27
+++ .cvsignore	6 Nov 2007 01:14:00 -0000	1.28
@@ -1 +1 @@
-fontconfig-2.4.91.tar.gz
+fontconfig-2.4.92.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- fontconfig.spec	26 Oct 2007 01:19:45 -0000	1.103
+++ fontconfig.spec	6 Nov 2007 01:14:00 -0000	1.104
@@ -2,18 +2,14 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.4.91
+Version: 2.4.92
 Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
 URL: http://fontconfig.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source1: 25-no-hint-fedora.conf
-Source2: 30-aliases-fedora.conf
-Source3: 40-generic-fedora.conf
-Source4: 64-nonlatin-fedora.conf
-Source5: 75-blacklist-fedora.conf
+Source1: 25-no-bitmap-fedora.conf
 
 BuildRequires: gawk
 BuildRequires: expat-devel
@@ -54,7 +50,7 @@
 # We don't want to rebuild the docs, but we want to install the included ones.
 export HASDOCBOOK=no
 
-%configure %--with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts
+%configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts
 
 make
 make check
@@ -65,10 +61,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s ../conf.avail/25-unhint-nonlatin.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 # move installed doc files back to build directory to package themm
 # in the right place
@@ -121,7 +114,7 @@
 %config %{_sysconfdir}/fonts/fonts.conf
 %doc %{_sysconfdir}/fonts/conf.avail/README
 %config %{_sysconfdir}/fonts/conf.avail/*.conf
-%config %{_sysconfdir}/fonts/conf.d/*.conf
+%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
 %dir %{_localstatedir}/cache/fontconfig
 
 %{_mandir}/man1/*
@@ -136,6 +129,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 25 2007 Behdad Esfahbod <besfahbo at redhat.com> - 2.4.92-1
+- Update to 2.4.92.
+- Mark /etc/fonts/conf.d/* as config(noreplace).
+- Remove most of our conf file, all upstreamed except for
+  75-blacklist-fedora.conf that I'm happily dropping.  Who has
+  Hershey fonts these days...
+- ln upstream'ed 25-unhint-nonlatin.conf from conf.avail in conf.d
+- Add 25-no-bitmap-fedora.conf which is the tiny remaining bit
+  of conf that didn't end up upstream.  Can get rid of it in the
+  future, but not just yet.
+
 * Thu Oct 25 2007 Behdad Esfahbod <besfahbo at redhat.com> - 2.4.91-1
 - Update to 2.4.91.
 - Add /usr/local/share/fonts to default config. (#147004)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fontconfig/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	26 Oct 2007 01:16:55 -0000	1.28
+++ sources	6 Nov 2007 01:14:00 -0000	1.29
@@ -1 +1 @@
-126f59b34499c70aaef2803f7fdd3ad3  fontconfig-2.4.91.tar.gz
+92018e32c8b5d4b7edc2f8e9f8e15d08  fontconfig-2.4.92.tar.gz


--- 25-no-hint-fedora.conf DELETED ---


--- 30-aliases-fedora.conf DELETED ---


--- 40-generic-fedora.conf DELETED ---


--- 64-nonlatin-fedora.conf DELETED ---


--- 75-blacklist-fedora.conf DELETED ---