auto-import xorg-x11-font-utils-6.99.99.901-1 on branch devel from
xorg-x11-font-utils-6.99.99.901-1.src.rpm
This commit is contained in:
mharris
parent
2d62a2f0e1
commit
02eb718fcb
@ -1,4 +1,4 @@
|
||||
bdftopcf-0.99.0.tar.bz2
|
||||
fonttosfnt-0.99.0.tar.bz2
|
||||
mkfontdir-0.99.0.tar.bz2
|
||||
mkfontscale-0.99.0.tar.bz2
|
||||
bdftopcf-0.99.1.tar.bz2
|
||||
fonttosfnt-0.99.1.tar.bz2
|
||||
mkfontdir-0.99.1.tar.bz2
|
||||
mkfontscale-0.99.1.tar.bz2
|
||||
|
||||
8
sources
8
sources
@ -1,4 +1,4 @@
|
||||
8f23af1e43ad6bc94e92421a225a69ce bdftopcf-0.99.0.tar.bz2
|
||||
7c54c85ee877a9d6ca955ecc52995cf8 fonttosfnt-0.99.0.tar.bz2
|
||||
14bf53da1d0b8d0f47afea0a07e54989 mkfontdir-0.99.0.tar.bz2
|
||||
9a4532c4748a85f3dedcf29c841aad82 mkfontscale-0.99.0.tar.bz2
|
||||
d5bdf1b76bcdfd8ac0a7a35a43a9a55d bdftopcf-0.99.1.tar.bz2
|
||||
4b2227ff198324bba114e2b54b0f33e3 fonttosfnt-0.99.1.tar.bz2
|
||||
3de12742390bf016fa1c26e8115eb63e mkfontdir-0.99.1.tar.bz2
|
||||
841fdb77891c0a47f2d50d13e4bc1bfc mkfontscale-0.99.1.tar.bz2
|
||||
|
||||
@ -9,19 +9,19 @@
|
||||
# an Epoch tag possibly unnecessarily - as Epoch is permanent and very evil.
|
||||
# If upstream later names it "xfs-7.0", then we bump the version to that,
|
||||
# and everything just works.
|
||||
%define upstreamversion 0.99.0
|
||||
%define upstreamversion 0.99.1
|
||||
|
||||
Summary: X.Org X11 font utilities
|
||||
Name: xorg-x11-%{pkgname}
|
||||
Version: 6.99.99.0
|
||||
Version: 6.99.99.901
|
||||
Release: 1
|
||||
License: MIT/X11
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/bdftopcf-0.99.0.tar.bz2
|
||||
Source1: http://xorg.freedesktop.org/X11R7.0-RC0/everything/fonttosfnt-0.99.0.tar.bz2
|
||||
Source2: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontdir-0.99.0.tar.bz2
|
||||
Source3: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontscale-0.99.0.tar.bz2
|
||||
Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/bdftopcf-%{upstreamversion}.tar.bz2
|
||||
Source1: http://xorg.freedesktop.org/X11R7.0-RC0/everything/fonttosfnt-%{upstreamversion}.tar.bz2
|
||||
Source2: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontdir-%{upstreamversion}.tar.bz2
|
||||
Source3: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontscale-%{upstreamversion}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# xorg-x11-libXfont-devel needed for bdftopcf
|
||||
@ -118,16 +118,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall
|
||||
popd
|
||||
}
|
||||
# FIXME: Move manpages to correct man section and rename them. This should
|
||||
# get submitted as a bug upstream for fonttosfnt.
|
||||
{
|
||||
echo "FIXME: Upstream fonttosfnt manpages install to incorrect location"
|
||||
#mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
for manpage in fonttosfnt ; do
|
||||
mv $RPM_BUILD_ROOT%{_mandir}/manm/$manpage.man $RPM_BUILD_ROOT%{_mandir}/man1/$manpage.1
|
||||
done
|
||||
rmdir $RPM_BUILD_ROOT%{_mandir}/manm
|
||||
}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -141,35 +131,14 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/mkfontdir
|
||||
%{_bindir}/mkfontscale
|
||||
%dir %{_mandir}
|
||||
%dir %{_mandir}/man1
|
||||
%{_mandir}/man1/bdftopcf.1*
|
||||
%{_mandir}/man1/mkfontdir.1*
|
||||
%{_mandir}/man1/mkfontscale.1*
|
||||
# FIXME: Upstream tarball installs this into "manm" dir, with .man suffix
|
||||
%{_mandir}/man1/fonttosfnt.1*
|
||||
%dir %{_mandir}/man1x
|
||||
%{_mandir}/man1x/bdftopcf.1x*
|
||||
%{_mandir}/man1x/mkfontdir.1x*
|
||||
%{_mandir}/man1x/mkfontscale.1x*
|
||||
%{_mandir}/man1x/fonttosfnt.1x*
|
||||
|
||||
######################################################################
|
||||
# FIXME: monolithic xorg-x11-font-utils file manifest, copied here for
|
||||
# ease of developmental comparison, until the package is complete and
|
||||
# finalized. I'll remove this once it's no longer useful. -- mharris
|
||||
#%files font-utils
|
||||
#%defattr(-,root,root)
|
||||
#%{_x11bindir}/bdftopcf
|
||||
#%{_x11mandir}/man1/bdftopcf.1*
|
||||
#%{_x11bindir}/bdftruncate
|
||||
#%{_x11mandir}/man1/bdftruncate.1*
|
||||
##%{_x11bindir}/fonttosfnt
|
||||
##%{_x11mandir}/man1/fonttosfnt.1*
|
||||
#%if %{with_fontconfig}
|
||||
#%{_x11bindir}/fc-cache
|
||||
#%{_x11bindir}/fc-list
|
||||
#%{_x11mandir}/man1/fc-cache.1*
|
||||
#%{_x11mandir}/man1/fc-list.1*
|
||||
#%endif
|
||||
#%{_x11bindir}/mkfontdir
|
||||
#%{_x11mandir}/man1/mkfontdir.1*
|
||||
#%{_x11bindir}/mkfontscale
|
||||
#%{_x11mandir}/man1/mkfontscale.1*
|
||||
#%{_x11mandir}/man1x/bdftruncate.1x*
|
||||
## The 'util' subdir is used by ucs2any, mkfontdir et al.
|
||||
#%dir %{_x11fontdir}/util
|
||||
#%{_x11fontdir}/util/*
|
||||
@ -178,18 +147,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
## FIXME: ucs2any should be moved to font-utils subpackage
|
||||
#%{_x11mandir}/man1/ucs2any.1*
|
||||
|
||||
#%dir %{_bindir}
|
||||
#%{_bindir}/twm
|
||||
#%dir %{_mandir}
|
||||
#%dir %{_mandir}/man1
|
||||
#%{_mandir}/man1/twm.1*
|
||||
# FIXME: modular build is not installing the twm config currently, find out
|
||||
# why and fix it.
|
||||
#%dir %{_sysconfdir}
|
||||
#%dir %{_sysconfdir}/X11/twm
|
||||
#%config %{_sysconfdir}/X11/twm/system.twmrc
|
||||
######################################################################
|
||||
|
||||
%changelog
|
||||
* Wed Oct 26 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-1
|
||||
- Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from
|
||||
X11R7 RC1.
|
||||
- Bumped package version to 6.99.99.901, the X11R7 RC1 release version tag.
|
||||
- Updated file manifest to to find the manpages in "man1x".
|
||||
|
||||
* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.0-1
|
||||
- Initial build.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user