X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=fontconfig.spec.in;h=90373527c8f199d9dcf14087f5288b84f412082f;hp=529f3eb2ef7037905bbe7403b010a01a6aa5fe1d;hb=HEAD;hpb=c674c89bf919fa7f357319a7ce825ba5369ff737

diff --git a/fontconfig.spec.in b/fontconfig.spec.in
index 529f3eb..9037352 100644
--- a/fontconfig.spec.in
+++ b/fontconfig.spec.in
@@ -38,16 +38,32 @@ header files, and developer docs for the fontconfig package.
 Install fontconfig-devel if you want to develop programs which 
 will use fontconfig.
 
+# Some rpm specific directories. Prefix 'my' hopefully does not collide with anything.
+%define my_docdir         %{_datadir}/doc/%{name}-%{version}
+%define my_develdocdir    %{_datadir}/doc/%{name}-devel-%{version}
+%define my_tmpdocdir      $RPM_BUILD_ROOT%{my_docdir}
+%define my_tmpdeveldocdir $RPM_BUILD_ROOT%{my_develdocdir}
+
 %prep
 %setup -q
 
 %build
-%configure --with-x-fonts=/usr/X11R6/lib/X11/fonts
+%configure --with-x-fonts=/usr/X11R6/lib/X11/fonts --disable-gtk-doc \
+	--with-docdir=%{my_docdir}
 make %{_smp_mflags}
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-%makeinstall
+{
+  %makeinstall docdir=%{my_tmpdocdir} 
+
+  # The make does not distinguish the base and devel packages
+  mkdir -p %{my_tmpdeveldocdir}
+  mv -f %{my_tmpdocdir}/*devel* %{my_tmpdeveldocdir}
+
+  # Use a more informative directory name:
+  mv -f %{my_tmpdeveldocdir}/fontconfig-devel %{my_tmpdeveldocdir}/html
+}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -62,26 +78,61 @@ make %{_smp_mflags}
 %postun -p /sbin/ldconfig
 
 %files
-%doc README AUTHORS COPYING ChangeLog doc/fontconfig-*.{html,txt}
-%{_libdir}/libfontconfig*.so.*
-%{_bindir}/fc-*
+%defattr(-, root, root)
+%doc README AUTHORS COPYING ChangeLog doc/fontconfig-user.{html,txt}
+%{my_docdir}/*
 %dir %{_sysconfdir}/fonts
 %{_sysconfdir}/fonts/fonts.conf
 %{_sysconfdir}/fonts/fonts.dtd
 %config %{_sysconfdir}/fonts/local.conf
+%{_bindir}/fc-*
+%{_libdir}/libfontconfig*.so.*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/libfontconfig.so
+#%doc doc/fontconfig-devel.txt doc/fontconfig-devel/*
+%{my_develdocdir}
+%dir %{_includedir}/fontconfig
+%{_includedir}/fontconfig/*
 %{_libdir}/*.a
 %{_libdir}/*.la
+%{_libdir}/libfontconfig.so
 %{_libdir}/pkgconfig
-%{_includedir}/fontconfig
+%{_mandir}/man3/*
 
 %changelog
+* Wed Mar 20 2004 Enrique Perez-Terron <enrio@online.no>
+- Added mandir /man1/* to main file list
+- Added missing '/*' after includedir/fontconfig to avoid "listed twice" error.
+- Removed configure option --disable-docs since its problem is solved, see below.
+- Added option to makeinstall to have it install docs in the proper directory.
+  Notice though that the %doc macro deletes and recreates the docs directory.
+- Cleaner separation of devel docs.
+- Renamed doc/fontconfig-devel-*/fontconfig-devel subdirectory to 'html'.
+- Removed %doc macro from devel filelist, since it deletes installed files.
+
+* Fri Mar  7 2003 Mike A. Harris <mharris@redhat.com> 2.1.92-1
+- Removed man1/* and added man5/* to main package and man3/* to devel package
+- Added missing defattr(-, root, root) to main package
+- Added HTML and text development documentation to -devel subpackage
+
+* Wed Mar  5 2003 Mike A. Harris <mharris@redhat.com>
+- Added back the configure macro options --disable-docs because otherwise
+  fontconfig installs docs into /usr/share/doc/fontconfig (with no version
+  number) unconditionally, causing RPM to fail the build due to unpackaged
+  files terminate build
+
+* 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