From ab0ab8df78c4e13f87810d6f2172a4f269d0b916086e99acec8fc16e1efcfd7b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 17 May 2012 09:22:08 +0000 Subject: [PATCH] - call spec-cleaner OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/intlfonts?expand=0&rev=5 --- intlfonts.changes | 5 +++ intlfonts.spec | 108 +++++++++++++++++++++++----------------------- 2 files changed, 59 insertions(+), 54 deletions(-) diff --git a/intlfonts.changes b/intlfonts.changes index 8ff60bf..61ab5b8 100644 --- a/intlfonts.changes +++ b/intlfonts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 17 09:10:14 UTC 2012 - pgajdos@suse.com + +- call spec-cleaner + ------------------------------------------------------------------- Thu Dec 22 15:41:17 CET 2011 - tiwai@suse.de diff --git a/intlfonts.spec b/intlfonts.spec index 018e1fd..0233443 100644 --- a/intlfonts.spec +++ b/intlfonts.spec @@ -16,6 +16,18 @@ # Name: intlfonts +Version: 1.2.1 +Release: 0 +License: SUSE-Public-Domain +Summary: Documentation for the International Fonts +Url: ftp://ftp.gnu.org/gnu/intlfonts/ +Group: System/X11/Fonts +Source0: intlfonts-1.2.1.tar.bz2 +Source1: gulim24.bdf.bz2 +Source2: fonts.scale.intlfonts-ttf +Source3: efont-iso8859-15.tar.bz2 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch0: intlfonts-1.2.dif BuildRequires: freetype2 BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel @@ -23,20 +35,9 @@ BuildRequires: xorg-x11-devel %define ttf_fontdir /usr/share/fonts/truetype %define type1_fontdir /usr/share/fonts/Type1 %define bdf_fontdir /usr/share/fonts/bdf -PreReq: %suseconfig_fonts_prereq -BuildArch: noarch -Version: 1.2.1 -Release: 0 -Summary: Documentation for the International Fonts -License: SUSE-Public-Domain -Group: System/X11/Fonts -Url: ftp://ftp.gnu.org/gnu/intlfonts/ -Source0: intlfonts-1.2.1.tar.bz2 -Source1: gulim24.bdf.bz2 -Source2: fonts.scale.intlfonts-ttf -Source3: efont-iso8859-15.tar.bz2 -Patch: intlfonts-1.2.dif +Requires(pre): %suseconfig_fonts_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This package contains the READMEs for international fonts from the @@ -68,10 +69,10 @@ intlfonts-bdf-fonts: Bitmap fonts useful for printing exotic languages from Emacs %package -n intlfonts-arabic-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Arabic Fonts for the X Window System License: SUSE-Public-Domain +Summary: Arabic Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:ar) Provides: ifntarab = %{version} Obsoletes: ifntarab <= 1.2.1 @@ -80,10 +81,10 @@ Obsoletes: ifntarab <= 1.2.1 Arabic fonts for the X Window System. %package -n intlfonts-asian-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Asian Fonts for the X Window System License: No license agreement found in package ; SUSE-Public-Domain +Summary: Asian Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:km;th;vi) Provides: ifntasia = %{version} Obsoletes: ifntasia <= 1.2.1 @@ -92,10 +93,10 @@ Obsoletes: ifntasia <= 1.2.1 Asian fonts for the X Window System. %package -n intlfonts-chinese-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Chinese Fonts for the X Window System License: PERMISSIVE-OSI-COMPLIANT +Summary: Chinese Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:zh) Provides: ifntchia = %{version} Obsoletes: ifntchia <= 1.2.1 @@ -104,10 +105,10 @@ Obsoletes: ifntchia <= 1.2.1 Chinese fonts for the X Window System. %package -n intlfonts-chinese-big-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Big Chinese Fonts for the X Window System License: SUSE-Public-Domain +Summary: Big Chinese Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:zh) Provides: ifntchib = %{version} Obsoletes: ifntchib <= 1.2.1 @@ -116,10 +117,10 @@ Obsoletes: ifntchib <= 1.2.1 Big Chinese fonts for the X Window System. %package -n intlfonts-ethiopic-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Ethiopic Fonts for the X Window System License: No license agreement found in package ; SUSE-Public-Domain +Summary: Ethiopic Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:am) Provides: ifntethi = %{version} Obsoletes: ifntethi <= 1.2.1 @@ -128,10 +129,10 @@ Obsoletes: ifntethi <= 1.2.1 Ethiopic fonts for the X Window System. %package -n intlfonts-euro-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: European fonts for the X Window System License: PERMISSIVE-OSI-COMPLIANT +Summary: European fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:cs;el) Provides: ifnteuro = %{version} Obsoletes: ifnteuro <= 1.2.1 @@ -142,10 +143,10 @@ European fonts for the X Window System (ISO 8859-1, 8859-2, 8859-3, KOI8-1/GOST19768.74-1). %package -n intlfonts-japanese-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Japanese Fonts for the X Window System License: SUSE-Public-Domain +Summary: Japanese Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:ja) Provides: ifntjapa = %{version} Obsoletes: ifntjapa <= 1.2.1 @@ -154,10 +155,10 @@ Obsoletes: ifntjapa <= 1.2.1 Japanese fonts for the X Window System. %package -n intlfonts-japanese-big-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Big Japanese Fonts for the X Window System License: SUSE-Public-Domain +Summary: Big Japanese Fonts for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: locale(xorg-x11:ja) Provides: ifntjapb = %{version} Obsoletes: ifntjapb <= 1.2.1 @@ -166,10 +167,10 @@ Obsoletes: ifntjapb <= 1.2.1 Big Japanese fonts for the X Window System. %package -n intlfonts-phonetic-bitmap-fonts -PreReq: %suseconfig_fonts_prereq -Summary: IPA font for the X Window System License: SUSE-Public-Domain +Summary: IPA font for the X Window System Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: ifntphon = %{version} Obsoletes: ifntphon <= 1.2.1 @@ -177,10 +178,10 @@ Obsoletes: ifntphon <= 1.2.1 The International Phonetic Alphabet font for the X Window System. %package -n intlfonts-ttf-fonts -PreReq: %suseconfig_fonts_prereq -Summary: TrueType Fonts from the GNU Intlfonts Package License: PERMISSIVE-OSI-COMPLIANT +Summary: TrueType Fonts from the GNU Intlfonts Package Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq Provides: intlfonts-ttf = %{version} Obsoletes: intlfonts-ttf <= 1.2.1 @@ -188,8 +189,8 @@ Obsoletes: intlfonts-ttf <= 1.2.1 TrueType fonts from the GNU intlfonts package. %package -n intlfonts-bdf-fonts -Summary: Fonts from the GNU Intlfonts Package in BDF Format License: PERMISSIVE-OSI-COMPLIANT +Summary: Fonts from the GNU Intlfonts Package in BDF Format Group: System/X11/Fonts Provides: intlfonts-bdf = %{version} Obsoletes: intlfonts-bdf <= 1.2.1 @@ -201,17 +202,17 @@ These fonts are useful for printing exotic languages such as Thai, Tibetan, Vietnamese, Arabic, and more from within Emacs. %package -n intlfonts-type1-fonts -PreReq: %suseconfig_fonts_prereq -Summary: Type1 Fonts from the GNU Intlfonts Package License: PERMISSIVE-OSI-COMPLIANT +Summary: Type1 Fonts from the GNU Intlfonts Package Group: System/X11/Fonts +Requires(pre): %suseconfig_fonts_prereq %description -n intlfonts-type1-fonts Type1 fonts from the GNU intlfonts package. %prep %setup -n intlfonts-1.2.1 -b 0 -a 3 -%patch +%patch0 bunzip2 -c $RPM_SOURCE_DIR/gulim24.bdf.bz2 > gulim24.bdf %build @@ -227,18 +228,17 @@ bunzip2 -c $RPM_SOURCE_DIR/gulim24.bdf.bz2 > gulim24.bdf done %install - rm -rf $RPM_BUILD_ROOT - mkdir -p $RPM_BUILD_ROOT%{bitmap_fontdir}/ + mkdir -p %{buildroot}%{bitmap_fontdir}/ set +o posix for f in $(find ./ -name '*.pcf.gz') ; do - install -m 0444 $f $RPM_BUILD_ROOT%{bitmap_fontdir}/ + install -m 0444 $f %{buildroot}%{bitmap_fontdir}/ done - mkdir -p $RPM_BUILD_ROOT%{ttf_fontdir}/ - install -m 0444 TrueType/*.ttf $RPM_BUILD_ROOT%{ttf_fontdir}/ - install -m 0444 $RPM_SOURCE_DIR/fonts.scale.intlfonts-ttf $RPM_BUILD_ROOT%{ttf_fontdir}/ - mkdir -p $RPM_BUILD_ROOT%{type1_fontdir}/ - install -m 0444 Type1/*.[ap]f? $RPM_BUILD_ROOT%{type1_fontdir}/ - mkdir -p $RPM_BUILD_ROOT%{bdf_fontdir}/ + mkdir -p %{buildroot}%{ttf_fontdir}/ + install -m 0444 TrueType/*.ttf %{buildroot}%{ttf_fontdir}/ + install -m 0444 $RPM_SOURCE_DIR/fonts.scale.intlfonts-ttf %{buildroot}%{ttf_fontdir}/ + mkdir -p %{buildroot}%{type1_fontdir}/ + install -m 0444 Type1/*.[ap]f? %{buildroot}%{type1_fontdir}/ + mkdir -p %{buildroot}%{bdf_fontdir}/ for f in \ lt1-24-etl lt1-16b-etl lt1-16i-etl lt1-16bi-etl lt1-24-etl lt1-16b-etl \ lt1-16i-etl lt1-16bi-etl lt2-24-etl lt3-24-etl lt4-24-etl thai24 \ @@ -246,21 +246,21 @@ bunzip2 -c $RPM_SOURCE_DIR/gulim24.bdf.bz2 > gulim24.bdf gb24st jiskan24 gulim24 jksp40 cns1-40 cns2-40 taipei24 taipei24 \ sish24-etl ipa24-etl visc24-etl visc24-etl arab24-0-etl arab24-1-etl \ lao24-mule arab24-2-etl ind1c24-mule tib1c24-mule tib24-mule \ - ethio24f-uni cns3-40 cns4-40 cns5-40 cns6-40 cns7-40 ind24-mule + ethio24f-uni cns3-40 cns4-40 cns5-40 cns6-40 cns7-40 ind24-mule do - install -m 0444 `find . -name $f.bdf` $RPM_BUILD_ROOT%{bdf_fontdir} + install -m 0444 `find . -name $f.bdf` %{buildroot}%{bdf_fontdir} done # install documents - mkdir -m 0755 -p $RPM_BUILD_ROOT%{_defaultdocdir}/intlfonts + mkdir -m 0755 -p %{buildroot}%{_defaultdocdir}/intlfonts find . -name 'README*' | while read i; do - mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/intlfonts/${i%/*} - install -m 0444 $i $RPM_BUILD_ROOT%{_defaultdocdir}/intlfonts/${i%/*} + mkdir -p %{buildroot}%{_defaultdocdir}/intlfonts/${i%/*} + install -m 0444 $i %{buildroot}%{_defaultdocdir}/intlfonts/${i%/*} done - cp -a $RPM_BUILD_ROOT%{_defaultdocdir}/intlfonts/Misc \ - $RPM_BUILD_ROOT%{_defaultdocdir}/intlfonts/Arabic + cp -a %{buildroot}%{_defaultdocdir}/intlfonts/Misc \ + %{buildroot}%{_defaultdocdir}/intlfonts/Arabic %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n intlfonts-arabic-bitmap-fonts %run_suseconfig_fonts