Author: salimma Update of /cvs/pkgs/rpms/fontpackages/EL-5 In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7234 Modified Files: .cvsignore fontpackages.spec sources Added Files: fontpackages-1.44-gfind.patch Log Message: * Fri Jul 9 2010 Michel Salim <salimma(a)fedoraproject.org&gt; - 1.44-1.1 - Adjust packaging for EL-5 fontpackages-1.44-gfind.patch: macros.fonts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fontpackages-1.44-gfind.patch --- --- fontpackages-1.44/rpm/macros.fonts.gfind 2010-06-13 16:43:19.000000000 +0200 +++ fontpackages-1.44/rpm/macros.fonts 2010-07-09 22:41:33.965071172 +0200 @@ -44,7 +44,7 @@ end local function meld(name1,name2) local name3 = "-" .. name2 .. "-" - for token in string.gmatch(name1 .. "-" , "..-%-") do + for token in string.gfind(name1 .. "-" , "..-%-") do token = string.gsub(token, "%-", "%%-") name3 = string.gsub(name3, "%-" .. token, "-") end Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/fontpackages/EL-5/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- .cvsignore 13 Jun 2010 16:55:20 -0000 1.33 +++ .cvsignore 9 Jul 2010 20:50:52 -0000 1.34 @@ -1 +1 @@ -fontpackages-1.44.tar.xz +fontpackages-1.44.tar.bz2 Index: fontpackages.spec =================================================================== RCS file: /cvs/pkgs/rpms/fontpackages/EL-5/fontpackages.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- fontpackages.spec 13 Jun 2010 16:55:20 -0000 1.43 +++ fontpackages.spec 9 Jul 2010 20:50:52 -0000 1.44 @@ -1,10 +1,13 @@ +# EL-5's RPM tries to generate debug_package on noarch.. and fails +%global debug_package %{nil} + %global spectemplatedir %{_sysconfdir}/rpmdevtools/ %global ftcgtemplatedir %{_datadir}/fontconfig/templates/ %global rpmmacrodir %{_sysconfdir}/rpm/ Name: fontpackages Version: 1.44 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Common directory and macro definitions used by font packages Group: Development/System @@ -12,9 +15,14 @@ Group: Development/System # license of the packages they're inserted in License: LGPLv3+ URL: http://fedoraproject.org/wiki/fontpackages -Source0: http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.xz +#Source0: http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.bz2 +# EL-5's embedded lua somehow does not know about string.gmatch even though +# the command-line interpreter does. use gfind instead. +Patch0: %{name}-1.44-gfind.patch BuildArch: noarch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -25,6 +33,7 @@ and other materials used to create font %package filesystem Summary: Directories used by font packages License: Public Domain +Group: Development/System %description filesystem This package contains the basic directory layout used by font packages, @@ -33,6 +42,7 @@ including the correct permissions for th %package devel Summary: Templates and macros used to create font packages +Group: Development/System Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} Requires: fontconfig @@ -44,6 +54,7 @@ create font packages. %package tools Summary: Tools used to check fonts and font packages +Group: Development/System Requires: fontconfig, fontforge Requires: curl, make, mutt @@ -55,6 +66,7 @@ This package contains tools used to chec %prep %setup -q +%patch0 -p1 %build @@ -133,6 +145,9 @@ rm -fr %{buildroot} %{_bindir}/* %changelog +* Fri Jul 9 2010 Michel Salim <salimma(a)fedoraproject.org&gt; - 1.44-1.1 +- Adjust packaging for EL-5 + * Sun Jun 13 2010 Nicolas Mailhot <nim at fedoraproject dot org> - 1.44-1 — Cleanup release Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/fontpackages/EL-5/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- sources 13 Jun 2010 16:55:20 -0000 1.33 +++ sources 9 Jul 2010 20:50:52 -0000 1.34 @@ -1 +1 @@ -e2339b08acf713349a9cab8e1294895e fontpackages-1.44.tar.xz +30a593b3ddfecc452cb3c8b0078bc32d fontpackages-1.44.tar.bz2