commit xorg-x11-fonts

12 Feb 2007

Hello community,

here is the log from the commit of package xorg-x11-fonts
checked in at Mon Feb 12 17:01:23 CET 2007.

--------

--- xorg-x11-fonts/xorg-x11-fonts.changes	2006-11-08 22:44:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes	2007-02-12 14:21:50.861514000 +0100
@@ -1,0 +2,6 @@
+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
+
+-------------------------------------------------------------------

New:
----
  font-misc-ethiopic.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-fonts.spec ++++++
--- /var/tmp/diff_new_pack.Qx2599/_old	2007-02-12 17:01:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Qx2599/_new	2007-02-12 17:01:11.000000000 +0100
@@ -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 @@
 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 @@
 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 @@
 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 @@
 /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.

++++++ font-misc-ethiopic.diff ++++++
--- 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

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit xorg-x11-fonts

root＠Hilbert.suse.de