SPECS: cups.spec - package nb, zh_CN locales - some more verbose fi...

[qboosh]

Author: qboosh                       Date: Wed Oct 24 21:43:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package nb,zh_CN locales
- some more verbose files
- CVE references for 1.2.7 and 1.3.0

---- Files affected:
SPECS:
   cups.spec (1.213 -> 1.214) 

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.213 SPECS/cups.spec:1.214
--- SPECS/cups.spec:1.213	Sun Oct 21 23:01:22 2007
+++ SPECS/cups.spec	Wed Oct 24 23:43:14 2007
@@ -11,8 +11,6 @@
 #   /usr/share/icons/hicolor/16x16/apps/cups.png
 #   /usr/share/icons/hicolor/32x32/apps/cups.png
 #   /usr/share/icons/hicolor/64x64/apps/cups.png
-#   /usr/share/locale/no/cups_no.po
-#   /usr/share/locale/zh/cups_zh.po
 #
 # Conditional build:
 %bcond_with	gnutls		# use GNU TLS for SSL/TLS support (instead of OpenSSL)
@@ -384,6 +382,11 @@
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/enable
 ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable
 
+# fix/update locale names
+install -d $RPM_BUILD_ROOT%{_datadir}/locale/{nb,zh_CN}
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no/cups_no.po,nb/cups_nb.po}
+mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh/cups_zh.po,zh_CN/cups_zh_CN.po}
+
 # check-files cleanup
 rm -rf $RPM_BUILD_ROOT%{_mandir}/{,es/,fr/}cat?
 rm -rf $RPM_BUILD_ROOT/''etc/{init.d,rc?.d}/*
@@ -498,11 +501,11 @@
 %lang(pl) %{_datadir}/cups/templates/pl
 %lang(sv) %{_datadir}/cups/templates/sv
 %lang(zh_TW) %{_datadir}/cups/templates/zh_TW
-%{_mandir}/man7/backend.7*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
-%{_mandir}/man7/filter.7*
 %{_mandir}/man1/lppasswd.1*
+%{_mandir}/man7/backend.7*
+%{_mandir}/man7/filter.7*
 %{_mandir}/man[58]/*
 
 %dir %attr(775,root,lp) /var/cache/cups
@@ -538,14 +541,13 @@
 %lang(ko) %{_datadir}/locale/ko/cups_ko.po
 %lang(ja) %{_datadir}/locale/ja/cups_ja.po
 %lang(nl) %{_datadir}/locale/nl/cups_nl.po
-#%lang(no) %{_datadir}/locale/no/cups_no.po
+%lang(nb) %{_datadir}/locale/nb/cups_nb.po
 %lang(pl) %{_datadir}/locale/pl/cups_pl.po
 %lang(pt) %{_datadir}/locale/pt/cups_pt.po
 %lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po
-#%lang(pt_PT) %{_datadir}/locale/pt_PT/cups_pt_PT.po
 %lang(ru) %{_datadir}/locale/ru/cups_ru.po
 %lang(sv) %{_datadir}/locale/sv/cups_sv.po
-#%lang(zh) %{_datadir}/locale/zh/cups_zh.po
+%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN.po
 %lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po
 
 %files clients
@@ -597,34 +599,36 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cups-config
+%attr(755,root,root) %{_libdir}/libcups.so
+%attr(755,root,root) %{_libdir}/libcupsimage.so
 %{_includedir}/cups
-%{_libdir}/lib*.so
-%{_mandir}/man1/cups-config*
-#%lang(fr) %{_mandir}/fr/man1/cups-config*
-#%lang(es) %{_mandir}/es/man1/cups-config*
+%{_mandir}/man1/cups-config.1*
+#%lang(fr) %{_mandir}/fr/man1/cups-config.1*
+#%lang(es) %{_mandir}/es/man1/cups-config.1*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libcups.a
+%{_libdir}/libcupsimage.a
 %endif
 
 %if %{with perl}
 %files -n perl-cups
 %defattr(644,root,root,755)
-%{perl_vendorarch}/*.pm
+%{perl_vendorarch}/CUPS.pm
 %dir %{perl_vendorarch}/auto/CUPS
-%{perl_vendorarch}/auto/CUPS/*.bs
+%{perl_vendorarch}/auto/CUPS/CUPS.bs
 %{perl_vendorarch}/auto/CUPS/autosplit.ix
-%attr(755,root,root) %{perl_vendorarch}/auto/CUPS/*.so
-%{_mandir}/man3/CUPS.3pm.gz
+%attr(755,root,root) %{perl_vendorarch}/auto/CUPS/CUPS.so
+%{_mandir}/man3/CUPS.3pm*
 %endif
 
 %if %{with php}
 %files -n php-cups
 %defattr(644,root,root,755)
 %doc scripting/php/README
-%attr(755,root,root) %{php_extensiondir}/*
+%attr(755,root,root) %{php_extensiondir}/phpcups.so
 %config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpcups.ini
 %endif
 
@@ -646,6 +650,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.214  2007/10/24 21:43:14  qboosh
+- package nb,zh_CN locales
+- some more verbose files
+- CVE references for 1.2.7 and 1.3.0
+
 Revision 1.213  2007/10/21 21:01:22  draenog
 - locale files and charmaps moved to cups-lib
 - CUPS.3pm.gz moved to perl-cups
@@ -679,7 +688,7 @@
 - 1.3.0 moved from DEVEL branch; 1.2 moved to CUPS_1_2 branch
 
 Revision 1.192.2.4  2007/08/16 07:24:12  arekm
-- final 1.3.0
+- final 1.3.0 [fixes CVE-2007-3387]
 
 Revision 1.192.2.3  2007/04/15 19:44:47  wolvverine
 - up to r6446
@@ -744,7 +753,7 @@
 - -devel R: zlib-devel
 
 Revision 1.177  2006/11/21 18:06:18  charles
-- updated to 1.2.7
+- updated to 1.2.7 [fixes CVE-2007-0720]
 - added it translation
 - -templates_pl.patch is back
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cups.spec?r1=1.213&r2=1.214&f=u