- use rpmbuild(macros) virtual, not direct package name

[packages/fonts-TTF-Bitstream-Cyberfonts.git] / fonts-TTF-Bitstream-Cyberfonts.spec

diff --git a/fonts-TTF-Bitstream-Cyberfonts.spec b/fonts-TTF-Bitstream-Cyberfonts.spec
index 7acd907041e63f9d0498ee8b8ed3ffc80a762a30..8f0a1f0e521822d865b6b8b19aedb88e23fbe1ac 100644 (file)
--- a/fonts-TTF-Bitstream-Cyberfonts.spec
+++ b/fonts-TTF-Bitstream-Cyberfonts.spec
@@ -2,16 +2,17 @@
 # Conditional build:
 %bcond_with    license_agreement       # generates package
 #
-Summary:       Bitstream Cyberfonts True Type font
-Summary(pl):   Font True Type Cyberfonts firmy Bitstream
 %define                base_name               fonts-TTF-Bitstream-Cyberfonts
+%define                rel                     3
+Summary:       Bitstream Cyberfonts TrueType font
+Summary(pl.UTF-8):     Font TrueType Cyberfonts firmy Bitstream
 %if %{with license_agreement}
 Name:          %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
 Version:       1.0
-Release:       2%{?with_license_agreement:wla}
+Release:       %{rel}%{?with_license_agreement:wla}
 License:       Nondistributable but free (See Bitstream-Cyberfonts-licence.txt)
 Group:         Fonts
 %if %{with license_agreement}
@@ -26,14 +27,15 @@ BuildRequires:      unzip
 # we need the -installer package as otherwise can't make end-user
 # package to work. see also comments in %%prep section.
 BuildRequires: %{base_name}-installer
-Requires:      %{_fontsdir}/TTF
 Requires(post,postun): fontpostinst
+Requires:      %{_fontsdir}/TTF
 %else
-Source0:       license-installer.sh
+Source0:       http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# NoSource0-md5:       329c25f457fea66ec502b7ef70cb9ede
 Source1:       %{base_name}-licence.txt
+Requires:      rpm-build-tools >= 4.4.37
+Requires:      rpmbuild(macros) >= 1.544
 Requires:      unzip
-Requires:      rpm-build-tools
-Requires:      wget
 %endif
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,7 +43,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                ttffontsdir     %{_fontsdir}/TTF
 
 %description
-Bitstream Cyberfonts True Type font.
+Bitstream Cyberfonts TrueType font.
 %if !%{with license_agreement}
 License issues made us not to include inherent files into this package
 by default. If you want to
@@ -51,12 +53,12 @@ command:
 %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
 %endif
 
-%description -l pl
-Font True Type Cyberfonts firmy Bitstream.
+%description -l pl.UTF-8
+Font TrueType Cyberfonts firmy Bitstream.
 %if !%{with license_agreement}
-Kwestie licencji zmusi³y nas do niedo³±czania do tego pakietu istotnych
-plików. Je¶li chcesz stworzyæ
-w pe³ni funkcjonalny pakiet, zbuduj go za pomoc± polecenia:
+Kwestie licencji zmusiły nas do niedołączania do tego pakietu istotnych
+plików. Jeśli chcesz stworzyć
+w pełni funkcjonalny pakiet, zbuduj go za pomocą polecenia:
 
 %{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
 %endif
@@ -84,6 +86,7 @@ sed -e '
        s-@RELEASE@-%{release}-g
        s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
        s,@LICENSE@,%{_datadir}/%{base_name}/Bitstream-Cyberfonts-licence.txt,
+       s,@DATADIR@,%{_datadir}/%{base_name},g
 ' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}