[fontpackages/el5] Revert "2015-03-14: Retired bacause of broken deps:"

Robert Scheck robert at fedoraproject.org
Sun Mar 15 19:26:27 UTC 2015


commit c52240933c0de8ff821b10f7ef5e5c0a1fa470fa
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Mar 15 14:34:49 2015 +0100

    Revert "2015-03-14: Retired bacause of broken deps:"
    
    This reverts commit 53e73225d00bd84f7783fa59d2cb235efb2a2052.

 .gitignore                    |   1 +
 dead.package                  |   4 -
 fontpackages-1.44-gfind.patch |  11 ++
 fontpackages.spec             | 337 ++++++++++++++++++++++++++++++++++++++++++
 sources                       |   1 +
 5 files changed, 350 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..690ac5f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+fontpackages-1.44.tar.bz2
diff --git a/fontpackages-1.44-gfind.patch b/fontpackages-1.44-gfind.patch
new file mode 100644
index 0000000..a6b2dfe
--- /dev/null
+++ b/fontpackages-1.44-gfind.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/fontpackages.spec b/fontpackages.spec
new file mode 100644
index 0000000..6abc1b3
--- /dev/null
+++ b/fontpackages.spec
@@ -0,0 +1,337 @@
+# 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}.2
+Summary: Common directory and macro definitions used by font packages
+
+Group:     Development/System
+# 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
+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
+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
+Group:   Development/System
+
+%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
+Group:   Development/System
+
+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
+Group:   Development/System
+
+Requires: fontconfig, fontforge
+Requires: curl, make, mutt
+Requires: fedora-packager, rpmlint, yum-utils
+
+%description tools
+This package contains tools used to check fonts and font packages
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+
+%build
+
+for file in bin/repo-font-audit bin/compare-repo-font-audit ; do
+sed -i "s|^DATADIR\([[:space:]]*\)\?=\(.*\)$|DATADIR=%{_datadir}/%{name}|g" \
+  $file
+done
+
+%install
+rm -fr %{buildroot}
+
+# 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 <<EOF > %{name}-%{version}.files
+%defattr(0644,root,root,0755)
+%dir ${_fontbasedir}
+%dir ${_fontconfig_masterdir}
+%dir ${_fontconfig_confdir}
+%dir ${_fontconfig_templatedir}
+EOF
+
+%clean
+rm -fr %{buildroot}
+
+
+%files filesystem -f %{name}-%{version}.files
+%defattr(0644,root,root,0755)
+%dir %{_datadir}/fontconfig
+
+%files devel
+%defattr(0644,root,root,0755)
+%doc license.txt readme.txt
+%config(noreplace) %{spectemplatedir}/*.spec
+%config(noreplace) %{rpmmacrodir}/macros*
+%dir %{ftcgtemplatedir}
+%{ftcgtemplatedir}/*conf
+%{ftcgtemplatedir}/*txt
+
+%files tools
+%defattr(0644,root,root,0755)
+%doc license.txt readme.txt
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/repo-font-audit.mk
+%defattr(0755,root,root,0755)
+%{_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 13 2015 Parag Nemade <pnemade AT fedoraproject DOT org> - 1.44-1.2
+- bump the release for re-review (rh#1181725)
+
+* Fri Jul  9 2010 Michel Salim <salimma at fedoraproject.org> - 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
+
+* Fri May 28 2010 Akira TAGOH <tagoh at redhat.com>
+- 1.42-2
+— Get rid of binding="same" from l10n-font-template.conf (#578015)
+
+* Sat Feb 13 2010 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.42-1
+— Update mailing list references
+
+* Tue Dec 01 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.41-1
+— Bugfix release
+
+* Sat Nov 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.40-1
+— Bugfix release
+
+* Mon Nov 23 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.35-1
+
+* Sun Nov 22 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.34-1
+— compare-repo-font-audit: make output more comprehensive
+
+* Sat Nov 21 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 1.30-1
+— Bugfix release
+
+* Tue Oct 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.29-1
+— Split out tools as repo-font-audit requirements grow
+
+* Mon Oct 19 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.28-1
+— Rework repo-font-audit to also generate individual packager nagmails
+
+* Mon Sep 28 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.27-1
+— Brownpaper bag release ×2
+
+* Sun Sep 27 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.26-1
+— Brownpaper bag release
+- 1.25-1
+– Add short test summary to repo-font-audit
+
+* Sat Sep 26 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.24-1
+– improve repo-font-audit (make WWS check more accurate, support file://
+  local repositories…)
+
+* Sun Sep 13 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.23-1
+— cleanups + add merging/remapping templates
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 1.22-2
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 20 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 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 <rel-eng at lists.fedoraproject.org>
+- 1.20-2
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.20-1
+— global-ization
+
+* Mon Feb 16 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 1.17-1
+⁇ Tweak and complete documentation
+☤ Merge the autoprovides stuff and try to make it actually work
+
+* Tue Jan 27 2009 Richard Hughes <rhughes at redhat.com>
+- 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.
+
+* Thu Jan 22 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.16-1
+
+* Thu Jan 15 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.15-1
+➜ lua-ize the main macro
+
+* Wed Jan 14 2009 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.14-1
+➽ Update for subpackage naming changes requested by FPC
+
+* Mon Dec 22 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 1.12-2
+⌂ Change homepage
+
+* Fri Dec 19 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.12-1
+☺ Add another macro to allow building fontconfig without cycling
+
+* Wed Dec 10 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.11-1
+☺ Add actual fedorahosted references
+
+* Sun Nov 23 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.10-1
+☺ renamed to “fontpackages”
+
+* Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 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 <nim at fedoraproject dot org>
+- 1.3-1
+☺ remove trailing slashes in directory macros
+
+* Tue Nov 11 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.2-1
+☺ add fontconfig templates
+☺ fix a few typos
+
+* Mon Nov 10 2008 Nicolas Mailhot <nim at fedoraproject dot org>
+- 1.0-1
+☺ initial release
diff --git a/sources b/sources
new file mode 100644
index 0000000..36e54ee
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+30a593b3ddfecc452cb3c8b0078bc32d  fontpackages-1.44.tar.bz2


More information about the fonts-bugs mailing list