Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit fonts-thai
- From: root@xxxxxxx (h_root)
- Date: Sun, 6 Aug 2006 22:24:17 +0200 (CEST)
- Message-id: <20060806202417.F23939D974@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package fonts-thai
checked in at Sun Aug 6 22:24:17 CEST 2006.
--------
--- fonts-thai/fonts-thai.changes 2006-03-01 14:43:21.000000000 +0100
+++ fonts-thai/fonts-thai.changes 2006-08-04 18:01:07.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 04 18:00:55 CEST 2006 - mfabian@xxxxxxx
+
+- move fonts to /usr/share/fonts/ in STABLE (paths changed
+ because of the move to Xorg X11R7).
+
+-------------------------------------------------------------------
New:
----
build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fonts-thai.spec ++++++
--- /var/tmp/diff_new_pack.L1nNP3/_old 2006-08-06 22:23:42.000000000 +0200
+++ /var/tmp/diff_new_pack.L1nNP3/_new 2006-08-06 22:23:42.000000000 +0200
@@ -11,18 +11,28 @@
# norootforbuild
Name: fonts-thai
+%if %suse_version > 910
BuildRequires: fontforge freetype2 xorg-x11 xorg-x11-devel
+%else
+BuildRequires: XFree86 XFree86-devel fontforge freetype2
+%endif
+%if "%(xft-config --prefix)" == "/usr"
+%define ttf_fontdir /usr/share/fonts/truetype
+%else
+%define ttf_fontdir /usr/X11R6/lib/X11/fonts/truetype
+%endif
License: distributable
Group: System/X11/Fonts
Autoreqprov: on
Prereq: %suseconfig_fonts_prereq
Provides: locale(th)
Version: 0.4.3.1
-Release: 5
+Release: 14
URL: http://linux.thai.net/cvs/
# cvs -d :pserver:anonymous@xxxxxxxxxxxxxx:/home/cvs login # blank password, just enter
# cvs -d :pserver:anonymous@xxxxxxxxxxxxxx:/home/cvs co software/thai-ttf
Source0: thaifonts-scalable-%version.tar.bz2
+Patch0: build.patch
BuildArchitectures: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A Collection of Thai TrueType Fonts
@@ -43,18 +53,16 @@
%prep
%setup -q -n thaifonts-scalable-%version
+%patch0 -p1
%build
-./configure --with-ttfdir=/usr/X11R6/lib/X11/fonts/truetype
+./configure --with-ttfdir=%{ttf_fontdir}
make
%install
make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype/encodings.dir
-rm -f $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype/fonts.*
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-#mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype/
-#install -c -m 644 */*.ttf $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/truetype
+rm -f $RPM_BUILD_ROOT%{ttf_fontdir}/encodings.dir
+rm -f $RPM_BUILD_ROOT%{ttf_fontdir}/fonts.*
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
@@ -68,10 +76,13 @@
%files
%defattr(-, root,root)
%doc AUTHORS COPYING NEWS README ChangeLog
-%dir /usr/X11R6/lib/X11/fonts/truetype/
-/usr/X11R6/lib/X11/fonts/truetype/*
+%dir %{ttf_fontdir}/
+%{ttf_fontdir}/*
%changelog -n fonts-thai
+* Fri Aug 04 2006 - mfabian@xxxxxxx
+- move fonts to /usr/share/fonts/ in STABLE (paths changed
+ because of the move to Xorg X11R7).
* Wed Mar 01 2006 - mfabian@xxxxxxx
- add "Provides: locale(th)".
* Wed Jan 25 2006 - mls@xxxxxxx
++++++ build.patch ++++++
diff -ru thaifonts-scalable-0.4.3.1.orig/Makefile.in thaifonts-scalable-0.4.3.1/Makefile.in
--- thaifonts-scalable-0.4.3.1.orig/Makefile.in 2005-07-03 11:19:53.000000000 +0200
+++ thaifonts-scalable-0.4.3.1/Makefile.in 2006-08-04 17:59:31.000000000 +0200
@@ -574,36 +574,6 @@
echo "***" ; \
exit 0; \
fi
-@INCLUDE_TTF_TRUE@ mkdir -p $(DESTDIR)$(ttfdir)
-@INCLUDE_TTF_TRUE@ cd $(DESTDIR)$(ttfdir); \
-@INCLUDE_TTF_TRUE@ $(ttmkfdir); \
-@INCLUDE_TTF_TRUE@ mkfontdir -e /usr/X11R6/lib/X11/fonts/encodings
-@INCLUDE_TTF_TRUE@ $(fccache) -f $(DESTDIR)$(ttfdir)
-@INCLUDE_TYPE1_TRUE@ mkdir -p $(DESTDIR)$(type1dir)
-@INCLUDE_TYPE1_TRUE@ cd $(DESTDIR)$(type1dir); \
-@INCLUDE_TYPE1_TRUE@ $(type1inst); \
-@INCLUDE_TYPE1_TRUE@ mkfontdir -e /usr/X11R6/lib/X11/fonts/encodings
-@INCLUDE_TYPE1_TRUE@ $(fccache) -f $(DESTDIR)$(type1dir)
-# @if test -z "$(DESTDIR)" ; then \
-#if INCLUDE_TTF
-# mkdir -p $(DESTDIR)$(ttfdir); \
-# cd $(DESTDIR)$(ttfdir); \
-# $(ttmkfdir); \
-# mkfontdir -e /usr/X11R6/lib/X11/fonts/encodings; \
-#endif
-#if INCLUDE_TYPE1
-# mkdir -p $(DESTDIR)$(type1dir); \
-# cd $(DESTDIR)$(type1dir); \
-# $(type1inst); \
-# mkfontdir -e /usr/X11R6/lib/X11/fonts/encodings; \
-#endif
-# $(fccache); \
-# @else \
-# echo "***" ; \
-# echo "*** Warning: Seems to be binary package building." ; \
-# echo "*** So, font list/cache is not generated" ; \
-# echo "***" ; \
-# @fi
uninstall-hook:
@INCLUDE_TTF_TRUE@ $(RM) $(DESTDIR)$(ttfdir)/fonts.cache-1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |