From 5966a11601685690685f7f0a34ba3dac9073ea2c Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Feb 24 2020 18:12:43 +0000 Subject: fontpackages is now deprecated, retired and unmaintained. New fonts packaging guidelines in Fedora use fonts-rpm-macros (effectively, fontpackages 2). To ease the transition, some fontpackages compatibility code has been added to fonts-rpm-macros. This compatibility code will be removed in Fedora 34. --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aee8b17..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fontpackages-1.44.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..239e1bb --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +fontpackages is now deprecated, retired and unmaintained. New fonts packaging guidelines in Fedora use fonts-rpm-macros (effectively, fontpackages 2). To ease the transition, some fontpackages compatibility code has been added to fonts-rpm-macros. This compatibility code will be removed in Fedora 34. diff --git a/dnf.patch b/dnf.patch deleted file mode 100644 index 07bbdec..0000000 --- a/dnf.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -ur fontpackages-1.44.orig/bin/repo-font-audit fontpackages-1.44/bin/repo-font-audit ---- fontpackages-1.44.orig/bin/repo-font-audit 2010-06-13 16:43:19.000000000 +0200 -+++ fontpackages-1.44/bin/repo-font-audit 2015-06-16 13:51:53.739107822 +0200 -@@ -1,5 +1,5 @@ - #!/bin/sh --# Quick and dirty script to audit font use in a yum package repository -+# Quick and dirty script to audit font use in a package repository - # - # It is slow, it is ugly, and it requires a good network connection - -@@ -332,7 +332,7 @@ - - echo "Looking for packages:" - echo "— with font metadata…" --repoquery --repofrompath=$REPOID,$FREPOURL --repoid=$REPOID \ -+$REPOQUERY --repofrompath=$REPOID,$FREPOURL --repoid=$REPOID \ - --qf "%{sourcerpm}|%{name}|%{epoch}:%{version}-%{release}|%{arch}|%{packagesize}|M" \ - --whatprovides "font(*)" --quiet \ - | sort | uniq \ -@@ -340,7 +340,7 @@ - > "$FPL" - - echo "— that include files with common font extensions…" --repoquery --repofrompath=$REPOID,$FREPOURL --repoid=$REPOID \ -+$REPOQUERY --repofrompath=$REPOID,$FREPOURL --repoid=$REPOID \ - --qf "%{sourcerpm}|%{name}|%{epoch}:%{version}-%{release}|%{arch}|%{packagesize}|E" \ - -f '*.ttf' -f '*.otf' -f '*.ttc' \ - -f '*.pfb' -f '*.pfa' \ -@@ -350,7 +350,7 @@ - > "$PWFL" - - echo "— that use the core X11 protocol…" --repoquery --repofrompath=$REPOID,$FREPOURL --repoid=$REPOID \ -+$REPOQUERY --repofrompath=$REPOID,$FREPOURL --repoid=$REPOID \ - --qf "%{sourcerpm}|%{name}|%{epoch}:%{version}-%{release}|%{arch}|%{packagesize}|X" \ - --whatrequires 'libX11.so*' \ - | sort | uniq \ -@@ -386,7 +386,7 @@ - echo -n "– $rpm ◔" - mkdir "$rpmd" - cd "$rpmd" -- rpm_loc=$(repoquery --repofrompath=$REPOID,$REPOURL --repoid=$REPOID \ -+ rpm_loc=$($REPOQUERY --repofrompath=$REPOID,$REPOURL --repoid=$REPOID \ - --location "$rpm" 2>/dev/null \ - | fix_url) - if $(echo "$rpm_loc" | grep -q -e '^[\./~]') ; then -@@ -1018,12 +1018,12 @@ - text library such as pango, pango-cairo, harfbuzz, or QT) - - You can self-check your packages at any time by: --1. installing createrepo and fontpackages-tools: --# yum install createrepo fontpackages-tools -+1. installing $CREATEREPO and fontpackages-tools: -+# $YUM install $CREATEREPO fontpackages-tools - 2. putting your packages and any font package they depends on in a - test directory --3. indexing this directory with createrepo: --$ createrepo path-to-test-directory -+3. indexing this directory with $CREATEREPO: -+$ $CREATEREPO path-to-test-directory - 4. running repo-font-audit: - $ repo-font-audit test absolute-path-to-test-directory - -@@ -1163,6 +1163,15 @@ - SRES="repo-font-audit-$ID-$TIMESTAMP-short" - SPAM="repo-font-audit-$ID-$TIMESTAMP-mail" - -+if [ -x /usr/bin/dnf ] ; then -+ CREATEREPO='createrepo_c' -+ REPOQUERY='dnf repoquery' -+ YUM='dnf' -+else -+ CREATEREPO='createrepo' -+ REPOQUERY='repoquery' -+ YUM='yum' -+fi - TMPDIR=$(mktemp -d --tmpdir=/tmp $RES-XXXXXXXXXX) - cd $TMPDIR - diff --git a/fontpackages-drop-fccache.patch b/fontpackages-drop-fccache.patch deleted file mode 100644 index dc1ca4d..0000000 --- a/fontpackages-drop-fccache.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -pruN fontpackages-1.44.orig/rpm/macros.fonts fontpackages-1.44/rpm/macros.fonts ---- fontpackages-1.44.orig/rpm/macros.fonts 2010-06-13 23:43:19.000000000 +0900 -+++ fontpackages-1.44/rpm/macros.fonts 2015-09-07 11:19:25.787718394 +0900 -@@ -74,18 +74,6 @@ print(meld(meld(pkgname,fontname),subnam - - %_font_pkg(n:f:) \ - %define spn %_font_pkg_name %{-n:%{-n*}} \ --%post -n %{spn} \ --if [ -x %{_bindir}/fc-cache ]; then \ -- %{_bindir}/fc-cache %{_fontdir} || : \ --fi \ --\ --\ --%postun -n %{spn} \ --if [ $1 -eq 0 -a -x %{_bindir}/fc-cache ] ; then \ -- %{_bindir}/fc-cache %{_fontdir} || : \ --fi\ --\ --\ - %files -n %{spn} \ - %defattr(0644,root,root,0755) \ - \ diff --git a/fontpackages.spec b/fontpackages.spec deleted file mode 100644 index 191d841..0000000 --- a/fontpackages.spec +++ /dev/null @@ -1,412 +0,0 @@ -%global spectemplatedir %{_sysconfdir}/rpmdevtools/ -%global ftcgtemplatedir %{_datadir}/fontconfig/templates/ -%global rpmmacrodir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d/) - -# Use the same directory of the main package for subpackage licence and docs -%global _docdir_fmt %{name} - -Name: fontpackages -Version: 1.44 -Release: 27%{?dist} -Summary: Common directory and macro definitions used by font packages - -# Mostly means the scriptlets inserted via this package do not change the -# 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 -Patch0: dnf.patch -Patch1: %{name}-drop-fccache.patch - -BuildArch: noarch -BuildRequires: perl-generators - - -%description -This package contains the basic directory layout, spec templates, rpm macros -and other materials used to create font packages. - - -%package filesystem -Summary: Directories used by font packages -License: Public Domain - -%description filesystem -This package contains the basic directory layout used by font packages, -including the correct permissions for the directories. - - -%package devel -Summary: Templates and macros used to create font packages - -Requires: rpmdevtools, %{name}-filesystem = %{version}-%{release} -Requires: fontconfig - -%description devel -This package contains spec templates, rpm macros and other materials used to -create font packages. - - -%package tools -Summary: Tools used to check fonts and font packages - -Requires: fontconfig, fontforge -Requires: curl, make, mutt -Requires: rpmlint -Requires: dnf-command(repoquery) -Requires: createrepo_c - -# repo-font-audit script need to run fedoradev-pkgowners command -# which is available on Fedora only and not on RHEL. -%if 0%{?fedora} -Requires: fedora-packager -%endif - -%description tools -This package contains tools used to check fonts and font packages. - - -%prep -%autosetup -p1 - -%if 0%{?rhel} -sed -i 's|/usr/bin/fedoradev-pkgowners|""|g' bin/repo-font-audit -%endif - -# Drop obosolete %defattr (#1047031) -sed -i '/^%%defattr/d' rpm/macros.fonts - -%build -sed -i "s|^DATADIR\([[:space:]]*\)\?=\(.*\)$|DATADIR=%{_datadir}/%{name}|g" \ - bin/repo-font-audit bin/compare-repo-font-audit - -%install -# Pull macros out of macros.fonts and emulate them during install -for dir in fontbasedir fontconfig_masterdir \ - fontconfig_confdir fontconfig_templatedir ; do - export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \ - rpm/macros.fonts | %{__awk} '{ print $2 }')) -done - -install -m 0755 -d %{buildroot}${_fontbasedir} \ - %{buildroot}${_fontconfig_masterdir} \ - %{buildroot}${_fontconfig_confdir} \ - %{buildroot}${_fontconfig_templatedir} \ - %{buildroot}%{spectemplatedir} \ - %{buildroot}%{rpmmacrodir} \ - %{buildroot}%{_datadir}/fontconfig/templates \ - %{buildroot}/%_datadir/%{name} \ - %{buildroot}%{_bindir} -install -m 0644 -p spec-templates/*.spec %{buildroot}%{spectemplatedir} -install -m 0644 -p fontconfig-templates/* %{buildroot}%{ftcgtemplatedir} -install -m 0644 -p rpm/macros* %{buildroot}%{rpmmacrodir} -install -m 0644 -p private/repo-font-audit.mk %{buildroot}/%{_datadir}/%{name} -install -m 0755 -p private/core-fonts-report \ - private/font-links-report \ - private/fonts-report \ - private/process-fc-query \ - private/test-info %{buildroot}/%{_datadir}/%{name} -install -m 0755 -p bin/* %{buildroot}%{_bindir} - -cat < %{name}-%{version}.files -%dir ${_fontbasedir} -%dir ${_fontconfig_masterdir} -%dir ${_fontconfig_confdir} -%dir ${_fontconfig_templatedir} -%ghost ${_fontbasedir}/.uuid -EOF - -%files filesystem -f %{name}-%{version}.files -%dir %{_datadir}/fontconfig - -%files devel -%license license.txt -%doc readme.txt -%config(noreplace) %{spectemplatedir}/*.spec -%{rpmmacrodir}/macros* -%dir %{ftcgtemplatedir} -%{ftcgtemplatedir}/*conf -%{ftcgtemplatedir}/*txt - -%files tools -%license license.txt -%doc readme.txt -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/repo-font-audit.mk -%{_datadir}/%{name}/core-fonts-report -%{_datadir}/%{name}/font-links-report -%{_datadir}/%{name}/fonts-report -%{_datadir}/%{name}/process-fc-query -%{_datadir}/%{name}/test-info -%{_bindir}/* - -%changelog -* Fri Feb 14 2020 Akira TAGOH - 1.44-27 -- Drop .uuid thing. - -* Tue Jan 28 2020 Fedora Release Engineering - 1.44-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.44-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Feb 06 2019 Akira TAGOH - 1.44-24 -- Fix a typo. - -* Thu Jan 31 2019 Fedora Release Engineering - 1.44-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 23 2018 Akira TAGOH -- Add .uuid as ghost file. - -* Fri Jul 13 2018 Fedora Release Engineering - 1.44-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Apr 14 2018 Parag Nemade - 1.44-21 -- Drop yum-utils conditionals as we don't need it anymore -- use %%autosetup -- Drop Group: tag - -* Wed Feb 07 2018 Fedora Release Engineering - 1.44-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.44-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.44-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 1.44-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 21 2016 Dan Horák - 1.44-16 -- fix conditional - -* Mon Sep 7 2015 Akira TAGOH - 1.44-15 -- Drop fc-cache from %%post/un in rpm macro. - -* Tue Aug 18 2015 Parag Nemade - 1.44-14 -- Port yum to dnf patch by Michael Mráka (rh#1156554) - -* Wed Jun 17 2015 Fedora Release Engineering - 1.44-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 29 2015 Zbigniew Jędrzejewski-Szmek - 1.44-12 -- Drop obsolete defattr stanzas (#1047031) - -* Wed Mar 4 2015 Ville Skyttä - 1.44-11 -- Install macros to %%{_rpmconfigdir}/macros.d where available (#1074274) -- Fix bogus date in %%changelog - -* Sat Jun 07 2014 Fedora Release Engineering - 1.44-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.44-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 18 2013 Petr Pisar - 1.44-8 -- Perl 5.18 rebuild - -* Sat Mar 09 2013 Ralf Corsépius - 1.44-7 -- Remove %%config from %%{_sysconfdir}/rpm/macros.* - (https://fedorahosted.org/fpc/ticket/259). - -* Wed Feb 13 2013 Fedora Release Engineering - 1.44-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.44-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue May 22 2012 Parag - 1.44-4 -- Resolves:rh#761409:remove fedora-packager dependency from -tools in RHEL - -* Fri Jan 13 2012 Fedora Release Engineering - 1.44-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jun 13 2010 Nicolas Mailhot -- 1.44-1 -— Cleanup release - -* Fri May 28 2010 Akira TAGOH -- 1.42-2 -— Get rid of binding="same" from l10n-font-template.conf (#578015) - -* Sat Feb 13 2010 Nicolas Mailhot -- 1.42-1 -— Update mailing list references - -* Tue Dec 01 2009 Nicolas Mailhot -- 1.41-1 -— Bugfix release - -* Sat Nov 28 2009 Nicolas Mailhot -- 1.40-1 -— Bugfix release - -* Mon Nov 23 2009 Nicolas Mailhot -- 1.35-1 - -* Sun Nov 22 2009 Nicolas Mailhot -- 1.34-1 -— compare-repo-font-audit: make output more comprehensive - -* Sat Nov 21 2009 Nicolas Mailhot -- 1.33-1 -— repo-font-audit: add ancilliary script to compare the results of two - different runs -- 1.32-1 -— repo-font-audit: add test for core fonts direct use -— repo-font-audit: replace font naming tests by a more comprehensive one - (in a separate utility) -— repo-font-audit: add fedora packager detection -— repo-font-audit: parallelize (at the cost of more filesystem space use) -— repo-font-audit: misc output and reliability fixes - -* Sun Nov 1 2009 Nicolas Mailhot -- 1.31-2 -— add yum-utils to deps -- 1.31-1 -— Rework repo-font-audit messages based on packager feedback - -* Thu Oct 29 2009 Nicolas Mailhot -- 1.30-1 -— Bugfix release - -* Tue Oct 27 2009 Nicolas Mailhot -- 1.29-1 -— Split out tools as repo-font-audit requirements grow - -* Mon Oct 19 2009 Nicolas Mailhot -- 1.28-1 -— Rework repo-font-audit to also generate individual packager nagmails - -* Mon Sep 28 2009 Nicolas Mailhot -- 1.27-1 -— Brownpaper bag release ×2 - -* Sun Sep 27 2009 Nicolas Mailhot -- 1.26-1 -— Brownpaper bag release -- 1.25-1 -– Add short test summary to repo-font-audit - -* Sat Sep 26 2009 Nicolas Mailhot -- 1.24-1 -– improve repo-font-audit (make WWS check more accurate, support file:// - local repositories…) - -* Sun Sep 13 2009 Nicolas Mailhot -- 1.23-1 -— cleanups + add merging/remapping templates - -* Fri Jul 24 2009 Fedora Release Engineering -- 1.22-2 -— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Sat Jun 20 2009 Nicolas Mailhot -- 1.22-1 -– workaround rpm eating end-of-line after %%_font_pkg calls -– add script to audit font sanity of yum repositories - -* Tue Jun 2 2009 Nicolas Mailhot -- 1.21-1 -— try to handle more corner naming cases in lua macro – expect some fallout - if your spec uses weird naming - -* Tue Feb 24 2009 Fedora Release Engineering -- 1.20-2 -— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 18 2009 Nicolas Mailhot -- 1.20-1 -— global-ization - -* Mon Feb 16 2009 Nicolas Mailhot -- 1.19-3 -— remove workaround and explicit version checks -- 1.19-2 -— workaround the fact koji is not ready yet -- 1.19-1 -— Add a fontconfig dep to -devel so font autoprovides work (bz#485702) -— Drop duplicated group declarations, rpm has been fixed (bz#470714) -— Add partial templates for fonts subpackages of non-font source packages -— Make them noarch (http://fedoraproject.org/wiki/Features/NoarchSubpackages) - -* Thu Feb 5 2009 Nicolas Mailhot -- 1.18-1 -✓ Panu wants autoprovides in rpm proper, drop it -✓ Guidelines people are ok with multiple ownership of directories, make the - fonts macro auto-own the directory font files are put into - -* Sat Jan 31 2009 Nicolas Mailhot -- 1.17-1 -⁇ Tweak and complete documentation -☤ Merge the autoprovides stuff and try to make it actually work - -* Tue Jan 27 2009 Richard Hughes -- 1.16-2 -- Add fontconfig.prov and macros.fontconfig so that we can automatically - generate font provides for packages at build time. - This lets us do some cool things with PackageKit in the future. - -* Wed Jan 21 2009 Nicolas Mailhot -- 1.16-1 - -* Thu Jan 15 2009 Nicolas Mailhot -- 1.15-1 -➜ lua-ize the main macro - -* Wed Jan 14 2009 Nicolas Mailhot -- 1.14-1 -➽ Update for subpackage naming changes requested by FPC - -* Mon Dec 22 2008 Nicolas Mailhot -- 1.13-1 -⟃ Add another directory to avoid depending on unowned stuff -❤ use it to put the fontconfig examples in a better place - -* Sun Dec 21 2008 Nicolas Mailhot -- 1.12-2 -⌂ Change homepage - -* Fri Dec 19 2008 Nicolas Mailhot -- 1.12-1 -☺ Add another macro to allow building fontconfig without cycling - -* Wed Dec 10 2008 Nicolas Mailhot -- 1.11-1 -☺ Add actual fedorahosted references - -* Sun Nov 23 2008 Nicolas Mailhot -- 1.10-1 -☺ renamed to “fontpackages” - -* Fri Nov 14 2008 Nicolas Mailhot -- 1.9-1 -☺ fix and complete fontconfig doc -- 1.8-1 -☺ simplify multi spec template: codify general case -- 1.7-1 -☺ split fontconfig template documentation is separate files -- 1.6-1 -☺ simplify spec templates -- 1.5-1 -☺ use ".conf" extension for fontconfig templates -- 1.4-1 -☺ small multi spec template fix - -* Wed Nov 12 2008 Nicolas Mailhot -- 1.3-1 -☺ remove trailing slashes in directory macros - -* Tue Nov 11 2008 Nicolas Mailhot -- 1.2-1 -☺ add fontconfig templates -☺ fix a few typos - -* Mon Nov 10 2008 Nicolas Mailhot -- 1.0-1 -☺ initial release diff --git a/sources b/sources deleted file mode 100644 index 5285c4f..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -e2339b08acf713349a9cab8e1294895e fontpackages-1.44.tar.xz