Author: nim Update of /cvs/extras/rpms/fontpackages/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15440/F-10
Modified Files: .cvsignore fontpackages.spec import.log sources Added Files: fontpackages-1.20-crufty-rpm.patch Log Message: 1.20 fontpackages-1.20-crufty-rpm.patch: --- NEW FILE fontpackages-1.20-crufty-rpm.patch --- diff -uNr fontpackages-1.20.orig/spec-templates/spectemplate-fonts-multi.spec fontpackages-1.20/spec-templates/spectemplate-fonts-multi.spec --- fontpackages-1.20.orig/spec-templates/spectemplate-fonts-multi.spec 2009-02-18 23:47:53.000000000 +0100 +++ fontpackages-1.20/spec-templates/spectemplate-fonts-multi.spec 2009-02-19 21:30:43.000000000 +0100 @@ -28,6 +28,7 @@ %package common Summary: Common files of <NAME> +Group: User Interface/X Requires: fontpackages-filesystem %description common @@ -38,6 +39,7 @@ # Repeat for every font family â %package -n %{fontname}-<FAMILY>-fonts Summary: +Group: User Interface/X Requires: %{name}-common = %{version}-%{release} %description -n %{fontname}-<FAMILY>-fonts diff -uNr fontpackages-1.20.orig/spec-templates/spectemplate-fonts-partial-multi.spec fontpackages-1.20/spec-templates/spectemplate-fonts-partial-multi.spec --- fontpackages-1.20.orig/spec-templates/spectemplate-fonts-partial-multi.spec 2009-02-18 23:47:53.000000000 +0100 +++ fontpackages-1.20/spec-templates/spectemplate-fonts-partial-multi.spec 2009-02-19 21:28:23.000000000 +0100 @@ -18,7 +18,6 @@ %package fonts-common Summary: Common files of <NAME> Group: User Interface/X -BuildArch: noarch Requires: fontpackages-filesystem %description fonts-common @@ -31,7 +30,6 @@ %package <FAMILY>-fonts Summary: Group: User Interface/X -BuildArch: noarch Requires: %{name}-fonts-common = %{version}-%{release} %description -n %{fontname}-<FAMILY>-fonts diff -uNr fontpackages-1.20.orig/spec-templates/spectemplate-fonts-partial-simple.spec fontpackages-1.20/spec-templates/spectemplate-fonts-partial-simple.spec --- fontpackages-1.20.orig/spec-templates/spectemplate-fonts-partial-simple.spec 2009-02-18 23:47:53.000000000 +0100 +++ fontpackages-1.20/spec-templates/spectemplate-fonts-partial-simple.spec 2009-02-19 22:08:19.000000000 +0100 @@ -12,7 +12,6 @@ %package <FAMILY>-fonts Summary: Group: User Interface/X -BuildArch: noarch Requires: fontpackages-filesystem %description <FAMILY>-fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Jan 2009 18:51:49 -0000 1.3 +++ .cvsignore 19 Feb 2009 21:18:35 -0000 1.4 @@ -1 +1 @@ -fontpackages-1.15.tar.bz2 +fontpackages-1.20.tar.bz2 Index: fontpackages.spec =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-10/fontpackages.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fontpackages.spec 16 Jan 2009 18:51:49 -0000 1.2 +++ fontpackages.spec 19 Feb 2009 21:18:36 -0000 1.3 @@ -1,9 +1,9 @@ -%define spectemplatedir %{_sysconfdir}/rpmdevtools/ -%define ftcgtemplatedir %{_datadir}/fontconfig/templates/ -%define rpmmacrodir %{_sysconfdir}/rpm/ +%global spectemplatedir %{_sysconfdir}/rpmdevtools/ +%global ftcgtemplatedir %{_datadir}/fontconfig/templates/ +%global rpmmacrodir %{_sysconfdir}/rpm/ Name: fontpackages -Version: 1.15 +Version: 1.20 Release: 1%{?dist} Summary: Common directory and macro definitions used by font packages @@ -13,9 +13,12 @@ License: LGPLv3+ URL: http://fedoraproject.org/wiki/fontpackages/ Source0: http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-1.20-crufty-rpm.patch + BuildArch: noarch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + %description This package contains the basic directory layout, spec templates, rpm macros and other materials used to create font packages. @@ -35,7 +38,7 @@ Summary: Templates and macros used to create font packages Group: User Interface/X -Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} +Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} %description devel This package contains spec templates, rpm macros and other materials used to @@ -45,6 +48,7 @@ %prep %setup -q +%patch0 -p1 -b .badrpm %build @@ -56,7 +60,7 @@ for dir in fontbasedir fontconfig_masterdir \ fontconfig_confdir fontconfig_templatedir ; do export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \ - macros/macros.fonts | %{__awk} '{ print $2 }')) + rpm/macros.fonts | %{__awk} '{ print $2 }')) done install -m 0755 -d %{buildroot}${_fontbasedir} \ @@ -68,7 +72,7 @@ %{buildroot}%{_datadir}/fontconfig/templates install -m 0644 -p spec-templates/*.spec %{buildroot}%{spectemplatedir} install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir} -install -m 0644 -p macros/macros* %{buildroot}%{rpmmacrodir} +install -m 0644 -p rpm/macros* %{buildroot}%{rpmmacrodir} cat <<EOF > %{name}-%{version}.files %defattr(0644,root,root,0755) @@ -93,10 +97,15 @@ %config(noreplace) %{spectemplatedir}/*.spec %config(noreplace) %{rpmmacrodir}/macros* %dir %{ftcgtemplatedir} -%{ftcgtemplatedir}/* +%{ftcgtemplatedir}/*conf +%{ftcgtemplatedir}/*txt %changelog +* Tue Feb 19 2009 Nicolas Mailhot <nim at fedoraproject dot org> +- 1.20-1 +â backport rawhide package to F-9 & F-10 + * Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org> - 1.15-1 â lua-ize the main macro Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-10/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 16 Jan 2009 18:51:49 -0000 1.2 +++ import.log 19 Feb 2009 21:18:36 -0000 1.3 @@ -1,2 +1,3 @@ fontpackages-1_11-1_fc11:F-10:fontpackages-1.11-1.fc11.src.rpm:1229379612 fontpackages-1_15-1_fc11:F-10:fontpackages-1.15-1.fc11.src.rpm:1232131877 +fontpackages-1_20-1_fc11:F-10:fontpackages-1.20-1.fc11.src.rpm:1235078269 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontpackages/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Jan 2009 18:51:49 -0000 1.3 +++ sources 19 Feb 2009 21:18:36 -0000 1.4 @@ -1 +1 @@ -69359230ae56bc40320bbe3df61f71d4 fontpackages-1.15.tar.bz2 +b836f00bcf709f42295f624bbf4f19c7 fontpackages-1.20.tar.bz2 _______________________________________________ Fedora-fonts-bugs-list mailing list Fedora-fonts-bugs-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list