Hello community,
here is the log from the commit of package xfntjp
checked in at Thu Jan 24 01:02:57 CET 2008.
--------
--- xfntjp/xfntjp.changes 2006-08-08 14:54:57.000000000 +0200
+++ /mounts/work_src_done/NOARCH/xfntjp/xfntjp.changes 2008-01-23 14:44:29.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Jan 23 13:18:52 CET 2008 - mfabian@suse.de
+
+- remove kanji32 font completely to be able to remove the
+ "NoSource" tag.
+- use fdupes.
+- bzip2 all sources.
+
+-------------------------------------------------------------------
Old:
----
kanji32.bdf.bz2
xfonts_jp.tgz
New:
----
xfonts_jp.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfntjp.spec ++++++
--- /var/tmp/diff_new_pack.Rs7895/_old 2008-01-24 00:59:57.000000000 +0100
+++ /var/tmp/diff_new_pack.Rs7895/_new 2008-01-24 00:59:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xfntjp (Version 20020904)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 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.
#
@@ -11,31 +11,25 @@
# norootforbuild
Name: xfntjp
-BuildRequires: freetype2 xorg-x11 xorg-x11-devel
-%define DISTRIBUTABLE 1
-License: distributable, Other License(s), see package
+BuildRequires: xorg-x11 xorg-x11-devel
+%if %suse_version > 1020
+BuildRequires: fdupes
+%endif
+License: Public Domain, Freeware
Group: System/X11/Fonts
-Autoreqprov: on
+AutoReqProv: on
PreReq: %suseconfig_fonts_prereq
Provides: locale(xorg-x11:ja)
Version: 20020904
-Release: 445
+Release: 569
Url: http://openlab.ring.gr.jp/efont/japanese/
Source0: http://openlab.ring.gr.jp/efont/dist/japanese/japanese-bitmap-fonts-0.4.5.ta...
Source1: mkbold
Source2: mkitalic
-Source3: kanji32.bdf.bz2
-%if %DISTRIBUTABLE
-NoSource: 3
-%endif
-Source4: xfonts_jp.tgz
+Source4: xfonts_jp.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildArchitectures: noarch
+BuildArch: noarch
Summary: Japanese Fixed Fonts for the X Window System
-Summary(ja): X用日本語固定幅フォント
-
-%description -l ja
-
%description
This Package contains Japanese fixed-width fonts for X11.
@@ -56,12 +50,12 @@
%else
%define fontdir /usr/X11R6/lib/X11/fonts/japanese
%endif
+
%prep
%setup -q -n japanese-bitmap-fonts-0.4.5
mkdir -p extra
pushd extra
- bunzip2 --stdout $RPM_SOURCE_DIR/kanji32.bdf.bz2 > kanji32.bdf
- tar zxvf $RPM_SOURCE_DIR/xfonts_jp.tgz
+ tar xvf $RPM_SOURCE_DIR/xfonts_jp.tar.bz2
popd
%build
@@ -71,7 +65,7 @@
rm build/fonts.dir
gzip -9 build/*.pcf
pushd extra
- for i in 7x14 7x14rk k14 8x16 8x16rk jiskan16 kanji32 ; do
+ for i in 7x14 7x14rk k14 8x16 8x16rk jiskan16 ; do
/usr/bin/perl $RPM_SOURCE_DIR/mkbold ${i}.bdf > ${i}b.bdf
/usr/bin/perl $RPM_SOURCE_DIR/mkitalic ${i}.bdf > ${i}i.bdf
/usr/bin/perl $RPM_SOURCE_DIR/mkbold ${i}i.bdf > ${i}bi.bdf
@@ -81,21 +75,17 @@
/usr/X11R6/bin/bdftopcf $j | gzip -9 > `basename $j .bdf`.pcf.gz
done
done
- # but include the non-(bold/italic) version of kanji32:
- /usr/X11R6/bin/bdftopcf kanji32.bdf | gzip -9 > kanji32.pcf.gz
popd
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{fontdir}
cp -p build/* $RPM_BUILD_ROOT%{fontdir}
cp -p extra/*.pcf* $RPM_BUILD_ROOT%{fontdir}
-%if %DISTRIBUTABLE
- rm -rf $RPM_BUILD_ROOT%{fontdir}/kanji32*
+%if %suse_version > 1020
+%fdupes $RPM_BUILD_ROOT%{fontdir}
%endif
%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
%post
%run_suseconfig_fonts
@@ -108,85 +98,90 @@
%doc README* ChangeLog
%{fontdir}
-%changelog -n xfntjp
-* Tue Aug 08 2006 - dmueller@suse.de
+%changelog
+* Wed Jan 23 2008 mfabian@suse.de
+- remove kanji32 font completely to be able to remove the
+ "NoSource" tag.
+- use fdupes.
+- bzip2 all sources.
+* Tue Aug 08 2006 dmueller@suse.de
- install fonts to /usr/share/fonts
-* Wed Mar 01 2006 - mfabian@suse.de
+* Wed Mar 01 2006 mfabian@suse.de
- add "Provides: locale(xorg-x11:ja)".
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Dec 03 2004 - mfabian@suse.de
+* Fri Dec 03 2004 mfabian@suse.de
- use new macro "%%run_suseconfig_fonts".
-* Fri Mar 19 2004 - mfabian@suse.de
+* Fri Mar 19 2004 mfabian@suse.de
- use %%suseconfig_fonts_prereq
-* Mon Mar 01 2004 - mfabian@suse.de
+* Mon Mar 01 2004 mfabian@suse.de
- run SuSEconfig.fonts and SuSEconfig.pango in %%post and %%postun
-* Sun Nov 02 2003 - ro@suse.de
+* Sun Nov 02 2003 ro@suse.de
- updated neededforbuild
-* Fri Jul 18 2003 - mfabian@suse.de
+* Fri Jul 18 2003 mfabian@suse.de
- Don't include kanji32.bdf in the binary rpm and mark it
as "NoSource" because there might be legal problems
distributing this font.
-* Thu Sep 05 2002 - mfabian@suse.de
+* Thu Sep 05 2002 mfabian@suse.de
- re-add lost bold, italic, and bold-italic versions of
kanji32 font and the 14 and 16 pixel X11 fonts.
-* Mon Aug 26 2002 - masaru@turbolinux.co.jp
+* Mon Aug 26 2002 masaru@turbolinux.co.jp
- upgraded to japanese-bitmap-fonts-0.4.5.
-* Mon Mar 11 2002 - mfabian@suse.de
+* Mon Mar 11 2002 mfabian@suse.de
- remove %%post and %%postun, SuSEconfig.fonts does that already,
it's better not duplicate the work of SuSEconfig.fonts.
-* Wed Feb 20 2002 - mfabian@suse.de
+* Wed Feb 20 2002 mfabian@suse.de
- fix changelog (build did fail an ia64 because of incorrectly
formatted changelog)
-* Wed Mar 07 2001 - mfabian@suse.de
+* Wed Mar 07 2001 mfabian@suse.de
- add xf86 to "# neededforbuild" (/usr/X11R6/bin/bdftopcf is
needed).
-* Tue Jan 30 2001 - mfabian@suse.de
+* Tue Jan 30 2001 mfabian@suse.de
- add shinonome12-1.0.8 and shinonome16-1.0.3
- update k14goth to version 1.6.9
- improve fonts.alias
- don't pack fonts.dir
- cleanup of spec file.
-* Fri Aug 04 2000 - mfabian@suse.de
+* Fri Aug 04 2000 mfabian@suse.de
- adapted to SuSE,
- updated Nagao San's knj10 fonts to version knj10-1.1
- added Nagao San's Nagamaru and Nagamin fonts
and bold, italic, and bold-italic versions of these.
- replaced 'fonts.dir.jp' by a call to mkfontdir
- patched 'mkitalic' which caused autobuild to fail
-* Wed Mar 01 2000 - Yasuyuki Furukawa