From: msweet Date: Tue, 24 Jun 2014 18:01:58 +0000 (+0000) Subject: The RPM spec file did not work due to the new Brazilian Portuguese localization X-Git-Tag: release-2.1.4~16^2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101de55370177e88dc71e43bee7141dadb01ba52;p=thirdparty%2Fcups.git The RPM spec file did not work due to the new Brazilian Portuguese localization (STR #4436) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11946 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES.txt b/CHANGES.txt index 255ca97956..be7bce621d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 1.7.4 - 2014-06-16 +CHANGES.txt - 1.7.4 - 2014-06-24 -------------------------------- CHANGES IN CUPS V1.7.4 @@ -11,6 +11,8 @@ CHANGES IN CUPS V1.7.4 - The web interface now properly shows a "Go" button for all text-based browsers (STR #4425) - The MaxJobTime directive now properly supports time values (STR #4434) + - The RPM spec file did not work due to the new Brazilian Portuguese + localization (STR #4436) CHANGES IN CUPS V1.7.3 diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 77643384c1..4c0068676e 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -21,6 +21,11 @@ # dnssd - Enable/disable DNS-SD support (default = enable) # libusb1 - Enable/disable LIBUSB 1.0 support (default = enable) # static - Enable/disable static libraries (default = enable) +# +# Note: Older Linux distributions use the name "libusbx-devel" or just +# "libusb-devel" for LIBUSB 1.0. There is absolutely nothing we can +# do to make this spec file build as-is on those distributions, you'll +# need to change the "BuildRequires" line accordingly... %{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}} %{?_with_dbus: %define _dbus --enable-dbus} @@ -283,6 +288,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/cups/it/* %dir /usr/share/doc/cups/ja /usr/share/doc/cups/ja/* +%dir /usr/share/doc/cups/pt_BR +/usr/share/doc/cups/pt_BR/* %dir /usr/share/doc/cups/ru /usr/share/doc/cups/ru/* @@ -300,6 +307,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/locale/it/cups_it.po %dir /usr/share/locale/ja /usr/share/locale/ja/cups_ja.po +%dir /usr/share/locale/pt_BR +/usr/share/locale/pt_BR/cups_pt_BR.po %dir /usr/share/locale/ru /usr/share/locale/ru/cups_ru.po