rpms/rpm/devel fontconfig.prov,1.1,1.2 rpm.spec,1.325,1.326

Panu Matilainen pmatilai at fedoraproject.org
Mon Feb 16 07:43:08 UTC 2009


Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28578

Modified Files:
	fontconfig.prov rpm.spec 
Log Message:
- updated fontconfig provide script - fc-query does all the hard work now



Index: fontconfig.prov
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/fontconfig.prov,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontconfig.prov	6 Feb 2009 06:54:05 -0000	1.1
+++ fontconfig.prov	16 Feb 2009 07:42:38 -0000	1.2
@@ -16,22 +16,4 @@
 
 # filter out anything outside main fontconfig path
 grep /usr/share/fonts/ |
-xargs $fcquery --format '%{family}\n:lang=%{lang}\n' 2> /dev/null |
-while read line; do
-	case $line in
-	:lang=*)
-		langs=${line#:lang=}
-		OLDIFS=$IFS
-		IFS='|'
-		for lang in $langs; do
-			echo :lang=$lang
-		done
-		IFS=$OLDIFS
-	;;
-	*)
-		echo "$line" | tr 'A-Z_' 'a-z-' | tr -d -c 'a-z0-9-\n'
-	;;
-	esac
-done |
-sed 's/\(.*\)/Font(\1)/' |
-sort -u
+xargs $fcquery --format '%{=pkgkit}' 2> /dev/null


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- rpm.spec	9 Feb 2009 09:59:15 -0000	1.325
+++ rpm.spec	16 Feb 2009 07:42:38 -0000	1.326
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -373,6 +373,9 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Feb 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-3
+- updated fontconfig provide script - fc-query does all the hard work now
+
 * Mon Feb 09 2009 Panu Matilainen <pmatilai at redhat.com> - 4.6.0-2
 - build against db 4.7.x
 




More information about the scm-commits mailing list