From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: "Valery V. Inozemtsev" Organization: ALT Linux To: ALT Devel discussion list , lav@etersoft.ru Date: Mon, 3 Sep 2007 17:35:17 +0400 User-Agent: KMail/1.9.7 References: <200709031256.26736.shrek@altlinux.ru> In-Reply-To: <200709031256.26736.shrek@altlinux.ru> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1557658.t4lxh4NYv2"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200709031735.25134.shrek@altlinux.ru> X-Virus-Scanned: ClamAV using ClamSMTP Subject: Re: [devel] fonts policy X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2007 13:35:25 -0000 Archived-At: List-Archive: List-Post: --nextPart1557658.t4lxh4NYv2 Content-Type: multipart/mixed; boundary="Boundary-01=_X2A3Grj7ZdqRJDe" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_X2A3Grj7ZdqRJDe Content-Type: text/plain; charset="windows-1251" Content-Transfer-Encoding: base64 Content-Disposition: inline wiDx7u7h+eXt6Ogg7vIgMyDx5e3y/+Hw/yAyMDA3IFZhbGVyeSBWLiBJbm96ZW10c2V2IO3g7+jx 4OsoYSk6Cj4gSGkhCj4KPiDu7/Ph6+jq7uLg7SDt7uL76SBmb250cyBwb2xpY3kKPiBodHRwOi8v d3d3LmZyZWVzb3VyY2UuaW5mby93aWtpL0FsdGxpbnV4L1BvbGljeS9Gb250cwo+IObk8yDn4Ozl 9+Dt6Okv5O7v7uvt5e3o6S/v7ubl6+Dt6OkKCu/g8vf8IOTr/yBycG0tYnVpbGQtZm9udHMKCi0t IApWYWxlcnkgVi4gSW5vemVtdHNldgo= --Boundary-01=_X2A3Grj7ZdqRJDe Content-Type: text/x-diff; charset="windows-1251"; name="rpm-build-fonts-0.1-new-policy.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="rpm-build-fonts-0.1-new-policy.patch" =2D-- rpm-build-fonts-0.1/macros.orig 2007-01-12 03:50:54 +0300 +++ rpm-build-fonts-0.1/macros 2007-09-03 17:33:31 +0400 @@ -3,6 +3,7 @@ # 12.02.2006, 12.01.2007 # =20 +%_fontpathdir %_sysconfdir/X11/fontpath.d %_fontsdir %_datadir/fonts %_bitmapfontsdir %_fontsdir/bitmap %_type1fontsdir %_fontsdir/type1 @@ -11,7 +12,7 @@ =20 %fonts_requires \ BuildRequires: rpm-build-fonts \ =2DPreReq: chkfontpath fontconfig \ +PreReq: fontconfig >=3D 2.4.2 \ %nil =20 # for use in %%install section (use with name of font family) @@ -22,13 +23,16 @@ PreReq: chkfontpath fontconfig \ mkdir -p %buildroot%__currentfontsdir \ cat <%{1}.files \ %%dir %__currentfontsdir \ =2D%%config %__currentfontsdir/fonts.cache-1 \ =2D%%config %__currentfontsdir/fonts.dir \ +%__currentfontsdir/fonts.scale \ +%__currentfontsdir/fonts.dir \ +%_fontpathdir/ttf-%{1}:pri=3D50 \ EOF\ install -p -m644 *.ttf %buildroot%__currentfontsdir/ \ find %buildroot%__currentfontsdir/ -name "*.ttf" | sed -e "s|%buildroot||g= " >>%{1}.files \ =2D%_sbindir/ttmkfdir -f %{1} -o %buildroot%__currentfontsdir/fonts.dir \ =2Dtouch %buildroot%__currentfontsdir/fonts.cache-1 \ +%_bindir/mkfontscale %buildroot%__currentfontsdir/ \ +ln -s fonts.scale %buildroot%__currentfontsdir/fonts.dir \ +mkdir -p %buildroot%_fontpathdir \ +ln -s ../../..%__currentfontsdir %buildroot%_fontpathdir/ttf-%{1}:pri=3D50= \ %nil =20 # TODO: split common parts @@ -40,13 +44,16 @@ touch %buildroot%__currentfontsdir/fonts mkdir -p %buildroot%__currentfontsdir \ cat <%{1}.files \ %%dir %__currentfontsdir \ =2D%%config %__currentfontsdir/fonts.cache-1 \ =2D%%config %__currentfontsdir/fonts.dir \ +%__currentfontsdir/fonts.scale \ +%__currentfontsdir/fonts.dir \ +%_fontpathdir/otf-%{1}:pri=3D50 \ EOF\ install -p -m644 *.otf %buildroot%__currentfontsdir/ \ find %buildroot%__currentfontsdir/ -name "*.otf" | sed -e "s|%buildroot||g= " >>%{1}.files \ =2D%_sbindir/ttmkfdir -f %{1} -o %buildroot%__currentfontsdir/fonts.dir \ =2Dtouch %buildroot%__currentfontsdir/fonts.cache-1 \ +%_bindir/mkfontscale %buildroot%__currentfontsdir \ +ln -s fonts.scale %buildroot%__currentfontsdir/fonts.dir \ +mkdir -p %buildroot%_fontpathdir \ +ln -s ../../..%__currentfontsdir %buildroot%_fontpathdir/otf-%{1}:pri=3D50= \ %nil =20 =20 @@ -56,13 +63,18 @@ touch %buildroot%__currentfontsdir/fonts mkdir -p %buildroot%__type1dir \ cat <%{1}.files \ %%dir %__type1dir \ =2D%%config %__type1dir/fonts.cache-1 \ =2D%%config %__type1dir/fonts.dir \ +%__type1dir/fonts.scale \ +%__type1dir/fonts.dir \ +%_fontpathdir/type1-%{1}:pri=3D40 \ EOF\ =2Dinstall -p -m644 *.afm *.pfb %buildroot%__type1dir \ +find -name \*.afm -exec install -p -m644 -t %buildroot%__type1dir {} \; \ +find -name \*.pfb -exec install -p -m644 -t %buildroot%__type1dir {} \; \ +find -name \*.pfa -exec install -p -m644 -t %buildroot%__type1dir {} \; \ find %buildroot%__type1dir/ -name "*.*" | sed -e "s|%buildroot||g" >>%{1}.= files \ =2Dmkfontdir %buildroot%__type1dir \ =2Dtouch %buildroot%__type1dir/fonts.cache-1 \ +mkfontscale %buildroot%__type1dir \ +ln -s fonts.scale %buildroot%__type1dir/fonts.dir \ +mkdir -p %buildroot%_fontpathdir \ +ln -s ../../..%__type1dir %buildroot%_fontpathdir/type1-%{1}:pri=3D40 \ %nil =20 %bitmap_fonts_install() \ @@ -71,25 +83,25 @@ touch %buildroot%__type1dir/fonts.cache- mkdir -p %buildroot%__currentfontsdir \ cat <%{1}.files \ %%dir %__currentfontsdir \ =2D%%config %__currentfontsdir/fonts.cache-1 \ =2D%%config %__currentfontsdir/fonts.dir \ +%__currentfontsdir/fonts.dir \ +%_fontpathdir/bitmap-%{1}:pri=3D20 \ EOF\ install -p -m644 *.pcf.gz %buildroot%__currentfontsdir/ \ =2Dfind %buildroot%__currentfontsdir/ -name "*.otf" | sed -e "s|%buildroot|= |g" >>%{1}.files \ =2D%_sbindir/ttmkfdir -f %{1} -o %buildroot%__currentfontsdir/fonts.dir \ =2Dtouch %buildroot%__currentfontsdir/fonts.cache-1 \ +find %buildroot%__currentfontsdir/ -name "*.pcf.gz" | sed -e "s|%buildroot= ||g" >>%{1}.files \ +%_bindir/mkfontdir %buildroot%__currentfontsdir \ +mkdir -p %buildroot%_fontpathdir \ +ln -s ../../..%__currentfontsdir %buildroot%_fontpathdir/bitmap-%{1}:pri= =3D20 \ %nil =20 # for use in %%post section %post_fonts \ %_bindir/fc-cache %__currentfontsdir || : \ =2D%_sbindir/chkfontpath -q --add %__currentfontsdir || : \ %nil =20 # for use in %%postun section %postun_fonts \ if [ "$1" =3D "0" ]; then \ =2D%_sbindir/chkfontpath -q --remove %__currentfontsdir || : \ +%_bindir/fc-cache --system-only || : \ fi \ %nil =20 =2D-- rpm-build-fonts-0.1/rpm-build-fonts.spec.orig 2007-01-12 03:51:40 +03= 00 +++ rpm-build-fonts-0.1/rpm-build-fonts.spec 2007-09-03 17:23:50 +0400 @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: rpm-build-compat =20 # for ttf, type1 fonts indexing =2DRequires: ttmkfdir xorg-x11-font-utils mkfontdir +Requires: xorg-x11-font-utils =20 %description RPM helper scripts for build fonts packages. --Boundary-01=_X2A3Grj7ZdqRJDe-- --nextPart1557658.t4lxh4NYv2 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.6 (GNU/Linux) iD8DBQBG3A2dcNyQ4l5HvIoRAisDAKCfKlgpJZVspkPdQhbewug3M+I2DgCfbv/G YQe2BVrUytfnYN4rUFSzNkw= =TZPu -----END PGP SIGNATURE----- --nextPart1557658.t4lxh4NYv2--