Update packaging files (Issue #4940)

diff --git a/CHANGES.txt b/CHANGES.txt
index e2975f549a6b57243622ec57de8dc92d4e0d468f..0fcae516c6e80e05a27891303126d6aca06b1a56 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.2.2 - 2016-12-14
+CHANGES.txt - 2.2.2 - 2017-01-03
 --------------------------------
 
 CHANGES IN CUPS V2.2.2
@@ -22,6 +22,7 @@ CHANGES IN CUPS V2.2.2
          uppercase letters (Issue #4919)
         - Updated documentation (PR #4896)
         - Updated localizations (PR #4894, PR #4895, PR #4904, PR #4908)
+        - Updated packaging files (Issue #4940)
 
 
 CHANGES IN CUPS V2.2.1

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 91c57b4febf13a81d2fa5b899525df22ac2cd164..132d2b5871f9a0a2f7d8c20f5395e29429696342 100644 (file)
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -1,7 +1,7 @@
 #
 # ESP Package Manager (EPM) file list for CUPS.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -413,24 +413,26 @@ d 0755 root $CUPS_GROUP $STATEDIR -
 d 0511 root $CUPS_PRIMARY_SYSTEM_GROUP $STATEDIR/certs -
 
 # Data files
+f 0444 root sys $LOCALEDIR/ca/cups_ca.po locale/cups_ca.po
+f 0444 root sys $LOCALEDIR/cs/cups_cs.po locale/cups_cs.po
 #f 0444 root sys $LOCALEDIR/da/cups_da.po locale/cups_da.po
-#f 0444 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
-#f 0444 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
+f 0444 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
+f 0444 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
 #f 0444 root sys $LOCALEDIR/et/cups_et.po locale/cups_et.po
 #f 0444 root sys $LOCALEDIR/eu/cups_eu.po locale/cups_eu.po
 #f 0444 root sys $LOCALEDIR/fi/cups_fi.po locale/cups_fi.po
-#f 0444 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
+f 0444 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
 #f 0444 root sys $LOCALEDIR/he/cups_he.po locale/cups_he.po
 #f 0444 root sys $LOCALEDIR/id/cups_id.po locale/cups_id.po
-#f 0444 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
-#f 0444 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
+f 0444 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
+f 0444 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
 #f 0444 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
 #f 0444 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
 #f 0444 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
 #f 0444 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
 #f 0444 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
-#f 0444 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
-#f 0444 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
+f 0444 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
+f 0444 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
 #f 0444 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
 #f 0444 root sys $LOCALEDIR/zh/cups_zh.po locale/cups_zh.po
 #f 0444 root sys $LOCALEDIR/zh_TW/cups_zh_TW.po locale/cups_zh_TW.po

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 02908331ea4aaa755ca0e95ba5db8a136ead6a4f..f132c1d80361c55bd7d4507f65e3af0f155e76b8 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,11 +1,9 @@
 #
-# "$Id$"
-#
 # RPM "spec" file for CUPS.
 #
 # Original version by Jason McMullan <jmcc@ontv.com>.
 #
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -279,6 +277,8 @@ rm -rf $RPM_BUILD_ROOT
 #/usr/share/doc/cups/fr/*
 %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/*
 
@@ -296,6 +296,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/ru/cups_pt_BR.po
 %dir /usr/share/locale/ru
 /usr/share/locale/ru/cups_ru.po
 
@@ -399,8 +401,3 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/cups/daemon/cups-lpd
 %dir /usr/share/man/man8
 /usr/share/man/man8/cups-lpd.8.gz
-
-
-#
-# End of "$Id$".
-#