walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated RPM specfile for 2.1.92 and fixed remaining known spec file issues

This commit is contained in:
Mike A. Harris 2003-03-08 01:03:32 +00:00
parent 6348213702
commit dbe9a11ea4
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Mar 7 07:55:00 EST 2003 Mike A. Harris <mharris@redhat.com>
+ RPM specfile cleanups for 2.1.92: Removed man1/* and added man5/*
to main package and man3/* to devel package
+ Added missing defattr(-, root, root) to main RPM package
+ Added HTML and text development documentation to -devel subpackage
Wed Mar 5 05:08:00 EST 2003 Mike A. Harris <mharris@redhat.com> Wed Mar 5 05:08:00 EST 2003 Mike A. Harris <mharris@redhat.com>
+ Added back the configure macro options --disable-docs, otherwise + Added back the configure macro options --disable-docs, otherwise
fontconfig installs docs into /usr/share/doc/fontconfig (with no fontconfig installs docs into /usr/share/doc/fontconfig (with no

19
fontconfig.spec.in
View File

@ -47,7 +47,14 @@ make %{_smp_mflags}
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%makeinstall {
%makeinstall
# fontconfig is currently installing these in improper location for RPM
# based Linux distributions, so we remove what it installs here, and let
# RPM pick up the same files with 'doc' directives in the file lists as
# a workaround
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/fontconfig
}
%clean %clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@ -62,6 +69,7 @@ make %{_smp_mflags}
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-, root, root)
%doc README AUTHORS COPYING ChangeLog doc/fontconfig-*.{html,txt} %doc README AUTHORS COPYING ChangeLog doc/fontconfig-*.{html,txt}
%dir %{_sysconfdir}/fonts %dir %{_sysconfdir}/fonts
%{_sysconfdir}/fonts/fonts.conf %{_sysconfdir}/fonts/fonts.conf
@ -69,18 +77,25 @@ make %{_smp_mflags}
%config %{_sysconfdir}/fonts/local.conf %config %{_sysconfdir}/fonts/local.conf
%{_bindir}/fc-* %{_bindir}/fc-*
%{_libdir}/libfontconfig*.so.* %{_libdir}/libfontconfig*.so.*
%{_mandir}/man1/* %{_mandir}/man5/*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%doc doc/fontconfig-devel.txt doc/fontconfig-devel/*
%dir %{_includedir}/fontconfig %dir %{_includedir}/fontconfig
%{_includedir}/fontconfig %{_includedir}/fontconfig
%{_libdir}/*.a %{_libdir}/*.a
%{_libdir}/*.la %{_libdir}/*.la
%{_libdir}/libfontconfig.so %{_libdir}/libfontconfig.so
%{_libdir}/pkgconfig %{_libdir}/pkgconfig
%{_mandir}/man3/*
%changelog %changelog
* 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> * Wed Mar 5 2003 Mike A. Harris <mharris@redhat.com>
- Added back the configure macro options --disable-docs because otherwise - Added back the configure macro options --disable-docs because otherwise
fontconfig installs docs into /usr/share/doc/fontconfig (with no version fontconfig installs docs into /usr/share/doc/fontconfig (with no version