From f8ab890c38eb5360d5aac578dfbf70242c7c70b0862bebaf9245f5b9b881fe6b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 12 Feb 2007 16:01:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-fonts?expand=0&rev=2 --- font-misc-ethiopic.diff | 122 ++++++++++++++++++++++++++++++++++++++++ xorg-x11-fonts.changes | 6 ++ xorg-x11-fonts.spec | 11 +++- 3 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 font-misc-ethiopic.diff diff --git a/font-misc-ethiopic.diff b/font-misc-ethiopic.diff new file mode 100644 index 0000000..aa7e7fd --- /dev/null +++ b/font-misc-ethiopic.diff @@ -0,0 +1,122 @@ +--- Makefile.am.orig 2007-02-12 14:12:27.228324571 +0100 ++++ Makefile.am 2007-02-12 14:14:24.701315546 +0100 +@@ -19,20 +19,12 @@ + # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +-ttffontdir = @TTFFONTDIR@ +-ttffont_DATA = GohaTibebZemen.ttf +- + otffontdir = @OTFFONTDIR@ + otffont_DATA = GohaTibebZemen.otf + +-EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh ++EXTRA_DIST = $(otffont_DATA) license.txt autogen.sh + + install-data-hook: +- @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale +- $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) +- @rm -f $(DESTDIR)$(ttffontdir)/font.dir +- $(MKFONTDIR) $(DESTDIR)$(ttffontdir) +- $(FCCACHE) $(DESTDIR)$(ttffontdir) + @rm -f $(DESTDIR)$(otffontdir)/fonts.scale + $(MKFONTSCALE) $(DESTDIR)$(otffontdir) + @rm -f $(DESTDIR)$(otffontdir)/font.dir +--- Makefile.in.orig 2007-02-12 14:14:31.183432175 +0100 ++++ Makefile.in 2007-02-12 14:16:53.405050524 +0100 +@@ -116,19 +116,16 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-ttffontdir = @TTFFONTDIR@ +-ttffont_DATA = GohaTibebZemen.ttf +- + otffontdir = @OTFFONTDIR@ + otffont_DATA = GohaTibebZemen.otf + +-EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh ++EXTRA_DIST = $(otffont_DATA) license.txt autogen.sh + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = + DIST_SOURCES = +-DATA = $(otffont_DATA) $(ttffont_DATA) ++DATA = $(otffont_DATA) + + DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 configure \ +@@ -171,24 +168,6 @@ + echo " rm -f $(DESTDIR)$(otffontdir)/$$f"; \ + rm -f $(DESTDIR)$(otffontdir)/$$f; \ + done +-ttffontDATA_INSTALL = $(INSTALL_DATA) +-install-ttffontDATA: $(ttffont_DATA) +- @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(ttffontdir) +- @list='$(ttffont_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(ttffontDATA_INSTALL) $$d$$p $(DESTDIR)$(ttffontdir)/$$f"; \ +- $(ttffontDATA_INSTALL) $$d$$p $(DESTDIR)$(ttffontdir)/$$f; \ +- done +- +-uninstall-ttffontDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(ttffont_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(ttffontdir)/$$f"; \ +- rm -f $(DESTDIR)$(ttffontdir)/$$f; \ +- done + tags: TAGS + TAGS: + +@@ -308,7 +287,7 @@ + all-am: Makefile $(DATA) + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(otffontdir) $(DESTDIR)$(ttffontdir) ++ $(mkinstalldirs) $(DESTDIR)$(otffontdir) + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -350,7 +329,7 @@ + + info-am: + +-install-data-am: install-otffontDATA install-ttffontDATA ++install-data-am: install-otffontDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +@@ -380,8 +359,7 @@ + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-otffontDATA \ +- uninstall-ttffontDATA ++uninstall-am: uninstall-info-am uninstall-otffontDATA + + .PHONY: all all-am check check-am clean clean-generic dist dist-all \ + dist-bzip2 dist-gzip distcheck distclean distclean-generic \ +@@ -389,18 +367,13 @@ + info-am install install-am install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-otffontDATA install-strip \ +- install-ttffontDATA installcheck installcheck-am installdirs \ ++ installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-otffontDATA uninstall-ttffontDATA ++ uninstall-info-am uninstall-otffontDATA + + + install-data-hook: +- @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale +- $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) +- @rm -f $(DESTDIR)$(ttffontdir)/font.dir +- $(MKFONTDIR) $(DESTDIR)$(ttffontdir) +- $(FCCACHE) $(DESTDIR)$(ttffontdir) + @rm -f $(DESTDIR)$(otffontdir)/fonts.scale + $(MKFONTSCALE) $(DESTDIR)$(otffontdir) + @rm -f $(DESTDIR)$(otffontdir)/font.dir diff --git a/xorg-x11-fonts.changes b/xorg-x11-fonts.changes index 454d472..0006d62 100644 --- a/xorg-x11-fonts.changes +++ b/xorg-x11-fonts.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 12 14:20:54 CET 2007 - sndirsch@suse.de + +- font-misc-ethiopic.diff: + * don't install TTF fonts any longer; OTF fonts should be enough + ------------------------------------------------------------------- Wed Nov 8 22:43:31 CET 2006 - sndirsch@suse.de diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec index 92ffaf9..ba0a69f 100644 --- a/xorg-x11-fonts.spec +++ b/xorg-x11-fonts.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-fonts (Version 7.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,7 +14,7 @@ Name: xorg-x11-fonts BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 8 +Release: 26 License: X11/MIT BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,6 +62,7 @@ Source34: font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2 Source35: font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2 Source36: font-alias-X11R7.0-1.0.1.tar.bz2 Patch: encodings.diff +Patch1: font-misc-ethiopic.diff %description This package contains fonts maintained and shipped with X.Org. @@ -88,6 +89,9 @@ for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done pushd encodings-* %patch popd +pushd font-misc-ethiopic-* +%patch1 +popd %build for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do @@ -162,6 +166,9 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/fonts/misc/fonts.alias %changelog -n xorg-x11-fonts +* Mon Feb 12 2007 - sndirsch@suse.de +- font-misc-ethiopic.diff: + * don't install TTF fonts any longer; OTF fonts should be enough * Wed Nov 08 2006 - sndirsch@suse.de - udpated font-screen-cyrillic to release 1.0.1 (X.Org 7.2 RC2) * Add license from Andrey via Mikhail on xorg list.