rpms/fontpackages/F-9 .cvsignore, 1.2, 1.3 fontpackages.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
Nicolas Mailhot
nim at fedoraproject.org
Fri Jan 16 18:53:05 UTC 2009
Author: nim
Update of /cvs/extras/rpms/fontpackages/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19834/F-9
Modified Files:
.cvsignore fontpackages.spec import.log sources
Log Message:
Import 1.15 to use FPC and FESCO approved package naming by default
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Dec 2008 22:33:49 -0000 1.2
+++ .cvsignore 16 Jan 2009 18:52:34 -0000 1.3
@@ -1 +1 @@
-fontpackages-1.11.tar.bz2
+fontpackages-1.15.tar.bz2
Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/fontpackages.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontpackages.spec 15 Dec 2008 22:33:49 -0000 1.1
+++ fontpackages.spec 16 Jan 2009 18:52:34 -0000 1.2
@@ -1,8 +1,9 @@
%define spectemplatedir %{_sysconfdir}/rpmdevtools/
+%define ftcgtemplatedir %{_datadir}/fontconfig/templates/
%define rpmmacrodir %{_sysconfdir}/rpm/
Name: fontpackages
-Version: 1.11
+Version: 1.15
Release: 1%{?dist}
Summary: Common directory and macro definitions used by font packages
@@ -10,8 +11,7 @@
# Mostly means the scriptlets inserted via this package do not change the
# license of the packages they're inserted in
License: LGPLv3+
-# Or git://git.fedorahosted.org/fontpackages.git
-URL: http://fedoraproject.org/wiki/Category:Fonts_SIG
+URL: http://fedoraproject.org/wiki/fontpackages/
Source0: http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
BuildArch: noarch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -53,22 +53,27 @@
rm -fr %{buildroot}
# Pull macros out of macros.fonts and emulate them during install
-for dir in fontbasedir fontconfig_confdir fontconfig_templatedir ; do
+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 }'))
done
install -m 0755 -d %{buildroot}${_fontbasedir} \
+ %{buildroot}${_fontconfig_masterdir} \
%{buildroot}${_fontconfig_confdir} \
%{buildroot}${_fontconfig_templatedir} \
%{buildroot}%{spectemplatedir} \
- %{buildroot}%{rpmmacrodir}
-install -m 0644 -p spec-templates/*.spec %{buildroot}%{spectemplatedir}
-install -m 0644 -p macros/macros* %{buildroot}%{rpmmacrodir}
+ %{buildroot}%{rpmmacrodir} \
+ %{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}
cat <<EOF > %{name}-%{version}.files
%defattr(0644,root,root,0755)
%dir ${_fontbasedir}
+%dir ${_fontconfig_masterdir}
%dir ${_fontconfig_confdir}
%dir ${_fontconfig_templatedir}
EOF
@@ -78,26 +83,52 @@
%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 fontconfig-templates/
+%doc license.txt readme.txt
%config(noreplace) %{spectemplatedir}/*.spec
%config(noreplace) %{rpmmacrodir}/macros*
+%dir %{ftcgtemplatedir}
+%{ftcgtemplatedir}/*
%changelog
+* 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
-* Fri Nov 14 2008 Nicolas Mailhot <nim at fedoraproject dot org>
- 1.8-1
⺠simplify multi spec template: codify general case
- 1.7-1
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 15 Dec 2008 22:33:49 -0000 1.1
+++ import.log 16 Jan 2009 18:52:34 -0000 1.2
@@ -1 +1,2 @@
fontpackages-1_11-1_fc11:F-9:fontpackages-1.11-1.fc11.src.rpm:1229380405
+fontpackages-1_15-1_fc11:F-9:fontpackages-1.15-1.fc11.src.rpm:1232131899
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Dec 2008 22:33:49 -0000 1.2
+++ sources 16 Jan 2009 18:52:34 -0000 1.3
@@ -1 +1 @@
-362046a39434fe95ea9c9ab4ea4880ba fontpackages-1.11.tar.bz2
+69359230ae56bc40320bbe3df61f71d4 fontpackages-1.15.tar.bz2
More information about the Fedora-fonts-bugs-list
mailing list