![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package terminus-bitmap-fonts for openSUSE:Factory checked in at 2012-09-14 12:39:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/terminus-bitmap-fonts (Old) and /work/SRC/openSUSE:Factory/.terminus-bitmap-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "terminus-bitmap-fonts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/terminus-bitmap-fonts/terminus-bitmap-fonts.changes 2012-07-02 11:17:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.terminus-bitmap-fonts.new/terminus-bitmap-fonts.changes 2012-09-14 12:39:50.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Sep 1 16:37:20 UTC 2012 - toms@opensuse.org + +- Updated to version 4.38 (no changelog found) +- SPEC file changes + . corrected patch terminus-bitmap-fonts.patch + . corrected provides and obsoletes + +------------------------------------------------------------------- +Wed Jul 4 12:39:06 CEST 2012 - pgajdos@suse.cz + +- amend spec file to reflect new font packaging scheme + (see openFATE#313536); + +------------------------------------------------------------------- Old: ---- terminus-font-4.28.tar.bz2 New: ---- terminus-font-4.38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ terminus-bitmap-fonts.spec ++++++ --- /var/tmp/diff_new_pack.bj2Vo9/_old 2012-09-14 12:39:51.000000000 +0200 +++ /var/tmp/diff_new_pack.bj2Vo9/_new 2012-09-14 12:39:51.000000000 +0200 @@ -19,16 +19,17 @@ %define fontname terminus-font Name: terminus-bitmap-fonts -Version: 4.28 -Release: 3 +Version: 4.38 +Release: 0 +Summary: Readable Fixed Width Fonts for X11 and the Linux Console License: GPL-2.0+ -Summary: readable fixed width fonts for X11 and the Linux console -Url: http://www.is-vn.bg/hamster/jimmy-en.html Group: System/X11/Fonts -# http://www.is-vn.bg/hamster/terminus-font-%{version}.tar.bz2 +Url: http://www.is-vn.bg/hamster/jimmy-en.html +# http://www.is-vn.bg/hamster/terminus-font-{version}.tar.bz2 Source0: %{fontname}-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: terminus-bitmap-fonts.patch +Patch1: %{name}.patch +BuildRequires: fontpackages-devel %if 0%{?suse_version} >= 1220 BuildRequires: bdftopcf %else @@ -37,11 +38,9 @@ %if 0%{?suse_version} < 1140 BuildRequires: freetype2-devel %endif -Requires(pre): %suseconfig_fonts_prereq +%reconfigure_fonts_prereq +Provides: terminus-font Provides: locale(ru;bg) -# FIXME: This causes a rpmlint warning; change <= to < once here's a new upstream version -Obsoletes: terminus-font <= %{version} -Provides: terminus-font = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -60,34 +59,27 @@ %prep %setup -q -n %{fontname}-%{version} -%patch1 -p1 -%define x11dir /usr/share/fonts/misc/ +%patch1 %define psfdir /usr/share/kbd/consolefonts %build +chmod +x ./configure ./configure --prefix=/usr -make -e x11dir=%{x11dir} psfdir=%{psfdir} +make -e x11dir=%{_miscfontsdir} psfdir=%{psfdir} %install -make -e DESTDIR=%{buildroot} x11dir=%{x11dir} psfdir=%{psfdir} install -rm -f %{buildroot}%{x11dir}/fonts.dir +make -e DESTDIR=%{buildroot} x11dir=%{_miscfontsdir} psfdir=%{psfdir} install +rm -f %{buildroot}%{_miscfontsdir}/fonts.dir pushd %{buildroot}%{psfdir} rename .psf.gz .psfu.gz *.psf.gz popd -%clean -#[ %{buildroot} != "/" ] && [ -d %{buildroot} ] && rm -rf %{buildroot} - -%post -%run_suseconfig_fonts - -%postun -%run_suseconfig_fonts +%reconfigure_fonts_scriptlets %files %defattr(-, root,root) %doc README* -%{x11dir} +%{_miscfontsdir} %{psfdir} %dir %{_datadir}/kbd ++++++ terminus-bitmap-fonts.patch ++++++ --- /var/tmp/diff_new_pack.bj2Vo9/_old 2012-09-14 12:39:51.000000000 +0200 +++ /var/tmp/diff_new_pack.bj2Vo9/_new 2012-09-14 12:39:51.000000000 +0200 @@ -1,10 +1,6 @@ ---- - Makefile | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -90,9 +90,9 @@ x11dir = $(prefix)/X11R6/lib/X11/fonts/l +--- Makefile.bak 2012-09-01 18:32:07.300831682 +0200 ++++ Makefile 2012-09-01 18:34:29.980338016 +0200 +@@ -87,9 +87,9 @@ install: $(PSF) $(PCF) mkdir -p $(DESTDIR)$(psfdir) @@ -16,7 +12,7 @@ uninstall: for i in $(PSF) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done -@@ -718,7 +718,7 @@ ter-v32b.psf: ter-u32b.bdf $(V_XOS42) $( +@@ -182,14 +182,15 @@ install-psf: $(PSF) mkdir -p $(DESTDIR)$(psfdir) @@ -25,16 +21,16 @@ uninstall-psf: for i in $(PSF) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done -@@ -784,7 +784,7 @@ install-acm: $(TXT) - for i in $(TXT) ; do \ - a=`echo $$i | sed -e "s/\.txt$$/.acm.gz/"` ; \ - if test ! -f $(TESTDIR)$(acmdir)/$$a ; then \ -- tail -n 128 $$i | grep -v FFFF | gzip > $(DESTDIR)$(acmdir)/$$a ; \ -+ tail -n 128 $$i | grep -v FFFF | gzip --best > $(DESTDIR)$(acmdir)/$$a ; \ - fi ; \ - done -@@ -1646,14 +1646,14 @@ ter-x32b.pcf: ter-u32b.bdf $(X_10646) + install-psf-512: $(PSF_XOS4_2) + mkdir -p $(DESTDIR)$(psfdir) +- for i in $(PSF_XOS4_2) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done ++ for i in $(PSF_XOS4_2) ; do gzip --best -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done ++ + + uninstall-psf-512: + for i in $(PSF_XOS4_2) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done +@@ -411,14 +412,14 @@ install-pcf: $(PCF) mkdir -p $(DESTDIR)$(x11dir) @@ -44,10 +40,27 @@ uninstall-pcf: for i in $(PCF) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done - install-n12: $(PCF_N12) + install-pcf-646: $(PCF_U_10646) + mkdir -p $(DESTDIR)$(x11dir) +- for i in $(PCF_U_10646) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done ++ for i in $(PCF_U_10646) ; do gzip --best -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done + + uninstall-pcf-646: + for i in $(PCF_U_10646) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done +@@ -427,14 +428,14 @@ + + install-n12: $(PCF) mkdir -p $(DESTDIR)$(x11dir) -- for i in $(PCF_N12) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done -+ for i in $(PCF_N12) ; do gzip --best -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done +- for i in `echo $(PCF) | $(cut12b_)` ; do ; gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done ++ for i in `echo $(PCF) | $(cut12b_)` ; do ; gzip --best -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done uninstall-n12: - for i in $(PCF_N12) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done + for i in `echo $(PCF) | $(cut12b_)` ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done + + install-n12-646: $(PCF_U_10646) + mkdir -p $(DESTDIR)$(x11dir) +- for i in `echo $(PCF_U_10646) | $(cut12b_)` ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done ++ for i in `echo $(PCF_U_10646) | $(cut12b_)` ; do gzip --best -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done + + uninstall-n12-646: + for i in `echo $(PCF_U_10646) | $(cut12b_)` ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done ++++++ terminus-font-4.28.tar.bz2 -> terminus-font-4.38.tar.bz2 ++++++ ++++ 171958 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org