rpms/fontpackages/devel .cvsignore, 1.7, 1.8 fontpackages.spec, 1.8, 1.9 import.log, 1.7, 1.8 sources, 1.7, 1.8 fontconfig.prov, 1.1, NONE macros.fontconfig, 1.1, NONE

[Nicolas Mailhot]

Author: nim

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

Modified Files:
	.cvsignore fontpackages.spec import.log sources 
Removed Files:
	fontconfig.prov macros.fontconfig 
Log Message:
1.18


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Jan 2009 21:45:16 -0000	1.7
+++ .cvsignore	5 Feb 2009 20:11:39 -0000	1.8
@@ -1 +1 @@
-fontpackages-1.16.tar.bz2
+fontpackages-1.18.tar.bz2


Index: fontpackages.spec
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/fontpackages.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fontpackages.spec	27 Jan 2009 09:49:32 -0000	1.8
+++ fontpackages.spec	5 Feb 2009 20:11:39 -0000	1.9
@@ -3,8 +3,8 @@
 %define rpmmacrodir     %{_sysconfdir}/rpm/
 
 Name:    fontpackages
-Version: 1.16
-Release: 2%{?dist}
+Version: 1.18
+Release: 1%{?dist}
 Summary: Common directory and macro definitions used by font packages
 
 Group:     Development/System
@@ -13,8 +13,6 @@
 License:   LGPLv3+
 URL:       http://fedoraproject.org/wiki/fontpackages/
 Source0:   http://fedorahosted.org/releases/f/o/%{name}/%{name}-%{version}.tar.bz2
-Source1:   fontconfig.prov
-Source2:   macros.fontconfig
 BuildArch: noarch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -58,7 +56,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} \
@@ -70,9 +68,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 0755 -D -p %{SOURCE1}          %{buildroot}%{_libdir}/rpm/fontconfig.prov
-install -m 0755 -D -p %{SOURCE2}          %{buildroot}%{_sysconfdir}/rpm/macros.fontconfig
+install -m 0644 -p rpm/macros*            %{buildroot}%{rpmmacrodir}
 
 cat <<EOF > %{name}-%{version}.files
 %defattr(0644,root,root,0755)
@@ -89,8 +85,6 @@
 %files filesystem -f %{name}-%{version}.files
 %defattr(0644,root,root,0755)
 %dir %{_datadir}/fontconfig
-%{_libdir}/rpm/fontconfig.prov
-%{_sysconfdir}/rpm/macros.fontconfig
 
 
 %files devel
@@ -99,10 +93,22 @@
 %config(noreplace) %{spectemplatedir}/*.spec
 %config(noreplace) %{rpmmacrodir}/macros*
 %dir %{ftcgtemplatedir}
-%{ftcgtemplatedir}/*
+%{ftcgtemplatedir}/*conf
+%{ftcgtemplatedir}/*txt
 
 
 %changelog
+* 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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	21 Jan 2009 21:45:16 -0000	1.7
+++ import.log	5 Feb 2009 20:11:39 -0000	1.8
@@ -5,3 +5,4 @@
 fontpackages-1_14-1_fc11:HEAD:fontpackages-1.14-1.fc11.src.rpm:1231978787
 fontpackages-1_15-1_fc11:HEAD:fontpackages-1.15-1.fc11.src.rpm:1232058014
 fontpackages-1_16-1_fc11:HEAD:fontpackages-1.16-1.fc11.src.rpm:1232573931
+fontpackages-1_18-1_fc11:HEAD:fontpackages-1.18-1.fc11.src.rpm:1233861977


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fontpackages/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Jan 2009 21:45:16 -0000	1.7
+++ sources	5 Feb 2009 20:11:39 -0000	1.8
@@ -1 +1 @@
-9d449121a0762b0e08cd1fdf99c10e92  fontpackages-1.16.tar.bz2
+afcfbffe48379897aaaf7260ec2f931d  fontpackages-1.18.tar.bz2


--- fontconfig.prov DELETED ---


--- macros.fontconfig DELETED ---