Updated rpm specfile changelog and Changelog to reflect today's changes

[fontconfig.git] / fontconfig.spec.in

diff --git a/fontconfig.spec.in b/fontconfig.spec.in
index ab8f4054f87122ed7bdade236c229ebbc3539a90..8dc7f578d1d19670cf3eeb74fe274eac50da38ef 100644 (file)
--- a/fontconfig.spec.in
+++ b/fontconfig.spec.in
@@ -53,34 +53,43 @@ make %{_smp_mflags}
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-
-# Force regeneration of all fontconfig cache files.
-fc-cache -f --system-only
+{
+  /sbin/ldconfig
+  # Force regeneration of all fontconfig cache files.
+  %{_bindir}/fc-cache -f --system-only
+}
 
 %postun -p /sbin/ldconfig
 
 %files
 %doc README AUTHORS COPYING ChangeLog doc/fontconfig-*.{html,txt}
-%{_libdir}/libfontconfig*.so.*
-%{_bindir}/fc-*
 %dir %{_sysconfdir}/fonts
 %{_sysconfdir}/fonts/fonts.conf
 %{_sysconfdir}/fonts/fonts.dtd
 %config %{_sysconfdir}/fonts/local.conf
+%{_bindir}/fc-*
+%{_libdir}/libfontconfig*.so.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/libfontconfig.so
+%dir %{_includedir}/fontconfig
+%{_includedir}/fontconfig
 %{_libdir}/*.a
 %{_libdir}/*.la
+%{_libdir}/libfontconfig.so
 %{_libdir}/pkgconfig
-%{_includedir}/fontconfig
 
 %changelog
+* Wed Mar  5 2003 Mike A. Harris <mharris@redhat.com>
+- Removed commented out rpm macro define at top of spec file, replacing it with
+  a simple explanation, since rpm macros are expanded by rpm even in comments
+- Changed /usr/bin to _bindir in BuildRequires lines
+- Cleaned up rpm postinstall script, and made fc-cache use _bindir
+- Reorganized file manifest lists
+
 * Sun Mar  2 2003 Owen Taylor <otaylor@redhat.com>
 - Various improvements from Red Hat spec file
 
-* Sun Mar 2 2003 Mike A. Harris <mharris@redhat.com> 2.1.90-0.1
+* Sun Mar  2 2003 Mike A. Harris <mharris@redhat.com>
 - Initial changelog entry