From 68a71061ca940cdbe5ef8a0bfc3526e9d754b828 Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Feb 05 2009 20:11:39 +0000
Subject: 1.18


---

diff --git a/.cvsignore b/.cvsignore
index 4ee20da..4bf029a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fontpackages-1.16.tar.bz2
+fontpackages-1.18.tar.bz2
diff --git a/fontconfig.prov b/fontconfig.prov
deleted file mode 100644
index 4846021..0000000
--- a/fontconfig.prov
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Script to install in:
-# /usr/lib/rpm/redhat/find-provides.d
-#
-# Transform font files into RPM provides
-# Requires fontconfig >= 2.6.90
-#
-# Author: Behdad Esfahbod <behdad@redhat.com>
-# Based on other provides scripts from RPM
-#
-
-grep '^/usr/share/fonts/' |
-xargs fc-query --format '%{family}\n:lang=%{lang}\n' |
-while read line; do
-	case $line in
-	:lang=*)
-		langs=${line#:lang=}
-		OLDIFS=$IFS
-		IFS='|'
-		for lang in $langs; do
-			echo :lang=$lang
-		done
-		IFS=$OLDIFS
-	;;
-	*)
-		echo "$line" | tr 'A-Z_' 'a-z-' | tr -d -c 'a-z0-9-\n'
-	;;
-	esac
-done |
-sed 's/\(.*\)/Font(\1)/' |
-sort -u
diff --git a/fontpackages.spec b/fontpackages.spec
index 1ab34c8..9498ea2 100644
--- a/fontpackages.spec
+++ b/fontpackages.spec
@@ -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 @@ Group:     Development/System
 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 @@ rm -fr %{buildroot}
 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 @@ install -m 0755 -d %{buildroot}${_fontbasedir} \
                    %{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 @@ rm -fr %{buildroot}
 %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 @@ rm -fr %{buildroot}
 %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@redhat.com>
 - 1.16-2
 - Add fontconfig.prov and macros.fontconfig so that we can automatically
diff --git a/import.log b/import.log
index 9ebaff0..e6e3948 100644
--- a/import.log
+++ b/import.log
@@ -5,3 +5,4 @@ fontpackages-1_13-1_fc11:HEAD:fontpackages-1.13-1.fc11.src.rpm:1229949018
 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
diff --git a/macros.fontconfig b/macros.fontconfig
deleted file mode 100644
index 6fd0431..0000000
--- a/macros.fontconfig
+++ /dev/null
@@ -1 +0,0 @@
-%__fontconfig_provides  /usr/lib/rpm/fontconfig.prov
diff --git a/sources b/sources
index 71cb218..c11f2d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d449121a0762b0e08cd1fdf99c10e92  fontpackages-1.16.tar.bz2
+afcfbffe48379897aaaf7260ec2f931d  fontpackages-1.18.tar.bz2