rpms/fontpackages/devel .cvsignore, 1.2, 1.3 fontpackages.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

[Nicolas Mailhot]

Author: nim

Update of /cvs/extras/rpms/fontpackages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13901/devel

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Log Message:
1.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Dec 2008 22:18:45 -0000	1.2
+++ .cvsignore	19 Dec 2008 22:38:08 -0000	1.3
@@ -1 +1 @@
-fontpackages-1.11.tar.bz2
+fontpackages-1.12.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontpackages.spec	15 Dec 2008 22:18:45 -0000	1.1
+++ fontpackages.spec	19 Dec 2008 22:38:08 -0000	1.2
@@ -2,7 +2,7 @@
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.11
+Version: 1.12
 Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
@@ -53,12 +53,14 @@
 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} \
@@ -69,6 +71,7 @@
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir ${_fontbasedir}
+%dir ${_fontconfig_masterdir}
 %dir ${_fontconfig_confdir}
 %dir ${_fontconfig_templatedir}
 EOF
@@ -88,6 +91,10 @@
 
 
 %changelog
+* 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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Dec 2008 22:18:45 -0000	1.1
+++ import.log	19 Dec 2008 22:38:08 -0000	1.2
@@ -1 +1,2 @@
 fontpackages-1_11-1_fc11:HEAD:fontpackages-1.11-1.fc11.src.rpm:1229379496
+fontpackages-1_12-1_fc11:HEAD:fontpackages-1.12-1.fc11.src.rpm:1229726060


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Dec 2008 22:18:45 -0000	1.2
+++ sources	19 Dec 2008 22:38:08 -0000	1.3
@@ -1 +1 @@
-362046a39434fe95ea9c9ab4ea4880ba  fontpackages-1.11.tar.bz2
+f0668a3a60d21ec16ecf89c8c192d899  fontpackages-1.12.tar.bz2