Merge CUPS 1.4svn-r7493.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@723 a1ca3aef-8c08-0410-bb20-df032aa958be

2 files changed, 41 insertions, 290 deletions

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index b5c069dd1..56ca4a937 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -95,57 +95,6 @@
 %subpackage lpd
 %description LPD support
 
-%subpackage da
-%description Danish support
-
-%subpackage de
-%description German support
-
-%subpackage es
-%description Spanish support
-
-%subpackage et
-%description Estonian support
-
-%subpackage fi
-%description Finish support
-
-%subpackage fr
-%description French support
-
-%subpackage he
-%description Hebrew support
-
-%subpackage it
-%description Italian support
-
-%subpackage ja
-%description Japanese support
-
-%subpackage ko
-%description Korean support
-
-%subpackage nl
-%description Dutch support
-
-%subpackage no
-%description Norwegian support
-
-%subpackage pl
-%description Polish support
-
-%subpackage pt
-%description Portuguese support
-
-%subpackage ru
-%description Russian support
-
-%subpackage sv
-%description Swedish support
-
-%subpackage zh
-%description Chinese support
-
 %subpackage
 
 
@@ -430,62 +379,60 @@ d 0755 root $CUPS_GROUP $STATEDIR -
 d 0511 root $CUPS_PRIMARY_SYSTEM_GROUP $STATEDIR/certs -
 
 # Data files
-%subpackage da
 f 0644 root sys $LOCALEDIR/da/cups_da.po locale/cups_da.po
 f 0644 root sys $LOCALEDIR/da/ppdc_da.po locale/ppdc_da.po
-%subpackage de
+
 f 0644 root sys $LOCALEDIR/de/cups_de.po locale/cups_de.po
 f 0644 root sys $LOCALEDIR/de/ppdc_de.po locale/ppdc_de.po
-%subpackage es
+
 f 0644 root sys $LOCALEDIR/es/cups_es.po locale/cups_es.po
 f 0644 root sys $LOCALEDIR/es/ppdc_es.po locale/ppdc_es.po
-%subpackage et
+
 f 0644 root sys $LOCALEDIR/et/cups_et.po locale/cups_et.po
 f 0644 root sys $LOCALEDIR/et/ppdc_et.po locale/ppdc_et.po
-%subpackage fi
+
 f 0644 root sys $LOCALEDIR/fi/cups_fi.po locale/cups_fi.po
 f 0644 root sys $LOCALEDIR/fi/ppdc_fi.po locale/ppdc_fi.po
-%subpackage fr
+
 f 0644 root sys $LOCALEDIR/fr/cups_fr.po locale/cups_fr.po
 f 0644 root sys $LOCALEDIR/fr/ppdc_fr.po locale/ppdc_fr.po
-%subpackage he
+
 f 0644 root sys $LOCALEDIR/he/cups_he.po locale/cups_he.po
 f 0644 root sys $LOCALEDIR/he/ppdc_he.po locale/ppdc_he.po
-%subpackage it
+
 f 0644 root sys $LOCALEDIR/it/cups_it.po locale/cups_it.po
 f 0644 root sys $LOCALEDIR/it/ppdc_it.po locale/ppdc_it.po
-%subpackage ja
+
 f 0644 root sys $LOCALEDIR/ja/cups_ja.po locale/cups_ja.po
 f 0644 root sys $LOCALEDIR/ja/ppdc_ja.po locale/ppdc_ja.po
-%subpackage ko
+
 f 0644 root sys $LOCALEDIR/ko/cups_ko.po locale/cups_ko.po
 f 0644 root sys $LOCALEDIR/ko/ppdc_ko.po locale/ppdc_ko.po
-%subpackage nl
+
 f 0644 root sys $LOCALEDIR/nl/cups_nl.po locale/cups_nl.po
 f 0644 root sys $LOCALEDIR/nl/ppdc_nl.po locale/ppdc_nl.po
-%subpackage no
+
 f 0644 root sys $LOCALEDIR/no/cups_no.po locale/cups_no.po
 f 0644 root sys $LOCALEDIR/no/ppdc_no.po locale/ppdc_no.po
-%subpackage pl
+
 f 0644 root sys $LOCALEDIR/pl/cups_pl.po locale/cups_pl.po
 f 0644 root sys $LOCALEDIR/pl/ppdc_pl.po locale/ppdc_pl.po
-%subpackage pt
+
 f 0644 root sys $LOCALEDIR/pt/cups_pt.po locale/cups_pt.po
 f 0644 root sys $LOCALEDIR/pt/ppdc_pt.po locale/ppdc_pt.po
 f 0644 root sys $LOCALEDIR/pt_BR/cups_pt_BR.po locale/cups_pt_BR.po
 f 0644 root sys $LOCALEDIR/pt_BR/ppdc_pt_BR.po locale/ppdc_pt_BR.po
-%subpackage ru
+
 f 0644 root sys $LOCALEDIR/ru/cups_ru.po locale/cups_ru.po
 f 0644 root sys $LOCALEDIR/ru/ppdc_ru.po locale/ppdc_ru.po
-%subpackage sv
+
 f 0644 root sys $LOCALEDIR/sv/cups_sv.po locale/cups_sv.po
 f 0644 root sys $LOCALEDIR/sv/ppdc_sv.po locale/ppdc_sv.po
-%subpackage zh
+
 f 0644 root sys $LOCALEDIR/zh/cups_zh.po locale/cups_zh.po
 f 0644 root sys $LOCALEDIR/zh/ppdc_zh.po locale/ppdc_zh.po
 f 0644 root sys $LOCALEDIR/zh_TW/cups_zh_TW.po locale/cups_zh_TW.po
 f 0644 root sys $LOCALEDIR/zh_TW/ppdc_zh_TW.po locale/ppdc_zh_TW.po
-%subpackage
 
 d 0755 root sys $DATADIR -
 
@@ -508,12 +455,14 @@ f 0644 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
 f 0644 root sys $DATADIR/data/psglyphs data/psglyphs
 f 0644 root sys $DATADIR/data/testprint.ps data/testprint.ps
 
+d 0755 root sys $DATADIR/drv -
+f 0644 root sys $DATADIR/drv/sample.drv ppdc/sample.drv
+
 d 0755 root sys $DATADIR/fonts -
 f 0644 root sys $DATADIR/fonts fonts/Courier*
 f 0644 root sys $DATADIR/fonts/Symbol fonts/Symbol
 
 d 0755 root sys $DATADIR/model -
-f 0644 root sys $DATADIR/model ppd/*.ppd
 
 d 0755 root sys $DATADIR/ppdc -
 f 0644 root sys $DATADIR/ppdc data/*.defs
@@ -523,37 +472,35 @@ d 0755 root sys $DATADIR/templates -
 f 0644 root sys $DATADIR/templates templates/*.tmpl
 
 ## Template files
-#%subpackage de
 #d 0755 root sys $DATADIR/templates/de
 #f 0644 root sys $DATADIR/templates/de templates/de/*.tmpl
-#%subpackage es
+
 #d 0755 root sys $DATADIR/templates/es
 #f 0644 root sys $DATADIR/templates/es templates/es/*.tmpl
-#%subpackage et
+
 #d 0755 root sys $DATADIR/templates/et
 #f 0644 root sys $DATADIR/templates/et templates/et/*.tmpl
-#%subpackage fr
+
 #d 0755 root sys $DATADIR/templates/fr
 #f 0644 root sys $DATADIR/templates/fr templates/fr/*.tmpl
-#%subpackage he
+
 #d 0755 root sys $DATADIR/templates/he
 #f 0644 root sys $DATADIR/templates/he templates/he/*.tmpl
-#%subpackage it
+
 #d 0755 root sys $DATADIR/templates/it
 #f 0644 root sys $DATADIR/templates/it templates/it/*.tmpl
-#%subpackage ja
+
 #d 0755 root sys $DATADIR/templates/ja
 #f 0644 root sys $DATADIR/templates/ja templates/ja/*.tmpl
-#%subpackage pl
+
 #d 0755 root sys $DATADIR/templates/pl
 #f 0644 root sys $DATADIR/templates/pl templates/pl/*.tmpl
-#%subpackage sv
+
 #d 0755 root sys $DATADIR/templates/sv
 #f 0644 root sys $DATADIR/templates/sv templates/sv/*.tmpl
-#%subpackage zh
+
 #d 0755 root sys $DATADIR/templates/zh_TW
 #f 0644 root sys $DATADIR/templates/zh_TW templates/zh_TW/*.tmpl
-#%subpackage
 
 # Config files
 d 0755 root sys $SERVERROOT -
@@ -631,38 +578,36 @@ f 0644 root sys $DOCDIR/images doc/images/*.png
 f 0644 root sys $DOCDIR/robots.txt doc/robots.txt
 
 # Localized documentation files
-#%subpackage de
 #d 0755 root sys $DOCDIR/de
 #f 0644 root sys $DOCDIR/de doc/de/*.html
-#%subpackage es
+
 #d 0755 root sys $DOCDIR/es
 #f 0644 root sys $DOCDIR/es doc/es/*.html
-#%subpackage et
+
 #d 0755 root sys $DOCDIR/et
 #f 0644 root sys $DOCDIR/et doc/et/*.html
-#%subpackage fr
+
 #d 0755 root sys $DOCDIR/fr
 #f 0644 root sys $DOCDIR/fr doc/fr/*.html
-#%subpackage he
+
 #d 0755 root sys $DOCDIR/he
 #f 0644 root sys $DOCDIR/he doc/he/*.html
 #f 0644 root sys $DOCDIR/he/cups.css doc/he/cups.css
-#%subpackage it
+
 #d 0755 root sys $DOCDIR/it
 #f 0644 root sys $DOCDIR/it doc/it/*.html
-#%subpackage ja
+
 #d 0755 root sys $DOCDIR/ja
 #f 0644 root sys $DOCDIR/ja doc/ja/*.html
-#%subpackage pl
+
 #d 0755 root sys $DOCDIR/pl
 #f 0644 root sys $DOCDIR/pl doc/pl/*.html
-#%subpackage sv
+
 #d 0755 root sys $DOCDIR/sv
 #f 0644 root sys $DOCDIR/sv doc/sv/*.html
-#%subpackage zh
+
 #d 0755 root sys $DOCDIR/zh_TW
 #f 0644 root sys $DOCDIR/zh_TW doc/zh_TW/*.html
-%subpackage
 
 # Man pages
 d 0755 root sys $AMANDIR -
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index d64d3b9f7..401de885a 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -67,91 +67,6 @@ Summary: Common UNIX Printing System - LPD support
 Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version} xinetd
 
-%package da
-Summary: Common UNIX Printing System - Danish support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package de
-Summary: Common UNIX Printing System - German support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package es
-Summary: Common UNIX Printing System - Spanish support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package et
-Summary: Common UNIX Printing System - Estonian support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package fi
-Summary: Common UNIX Printing System - Finnish support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package fr
-Summary: Common UNIX Printing System - French support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package he
-Summary: Common UNIX Printing System - Hebrew support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package it
-Summary: Common UNIX Printing System - Italian support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package ja
-Summary: Common UNIX Printing System - Japanese support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package ko
-Summary: Common UNIX Printing System - Korean support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package nl
-Summary: Common UNIX Printing System - Dutch support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package no
-Summary: Common UNIX Printing System - Nowegian support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package pl
-Summary: Common UNIX Printing System - Polish support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package pt
-Summary: Common UNIX Printing System - Portuguese support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package ru
-Summary: Common UNIX Printing System - Russian support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package sv
-Summary: Common UNIX Printing System - Swedish support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
-%package zh
-Summary: Common UNIX Printing System - Chinese support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version}
-
 %if %{?_with_php:1}%{!?_with_php:0}
 %package php
 Summary: Common UNIX Printing System - PHP support
@@ -386,14 +301,15 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/cups/charsets/*
 %dir /usr/share/cups/data
 /usr/share/cups/data/*
+%dir /usr/share/cups/drv
+/usr/share/cups/drv/*
 %dir /usr/share/cups/fonts
 /usr/share/cups/fonts/*
 %dir /usr/share/cups/model
-/usr/share/cups/model/*
 %dir /usr/share/cups/ppdc
 /usr/share/cups/ppdc/*
 %dir /usr/share/cups/templates
-/usr/share/cups/templates/*.tmpl
+/usr/share/cups/templates/*
 %dir /usr/share/doc/cups
 /usr/share/doc/cups/*.*
 %dir /usr/share/doc/cups/help
@@ -414,6 +330,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/cups/help/whatsnew.html
 %dir /usr/share/doc/cups/images
 /usr/share/doc/cups/images/*
+/usr/share/locale/*
 
 %dir /usr/share/man/man1
 /usr/share/man/man1/cancel.1.gz
@@ -498,117 +415,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/man/man8
 /usr/share/man/man8/cups-lpd.8.gz
 
-%files da
-%defattr(-,root,root)
-/usr/share/locale/da/*
-
-%files de
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/de
-#/usr/share/doc/cups/de/index.html
-#%dir /usr/share/cups/templates/de
-#/usr/share/cups/templates/de/*
-/usr/share/locale/de/*
-
-%files es
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/es
-#/usr/share/doc/cups/es/index.html
-#%dir /usr/share/cups/templates/es
-#/usr/share/cups/templates/es/*
-/usr/share/locale/es/*
-
-%files et
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/et
-#/usr/share/doc/cups/et/index.html
-#%dir /usr/share/cups/templates/et
-#/usr/share/cups/templates/et/*
-/usr/share/locale/et/*
-
-%files fi
-%defattr(-,root,root)
-/usr/share/locale/fi/*
-
-%files fr
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/fr
-#/usr/share/doc/cups/fr/index.html
-#%dir /usr/share/cups/templates/fr
-#/usr/share/cups/templates/fr/*
-/usr/share/locale/fr/*
-
-%files he
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/he
-#/usr/share/doc/cups/he/index.html
-#/usr/share/doc/cups/he/cups.css
-#%dir /usr/share/cups/templates/he
-#/usr/share/cups/templates/he/*
-/usr/share/locale/he/*
-
-%files it
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/it
-#/usr/share/doc/cups/it/index.html
-#%dir /usr/share/cups/templates/it
-#/usr/share/cups/templates/it/*
-/usr/share/locale/it/*
-
-%files ja
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/ja
-#/usr/share/doc/cups/ja/index.html
-#%dir /usr/share/cups/templates/ja
-#/usr/share/cups/templates/ja/*
-/usr/share/locale/ja/*
-
-%files ko
-%defattr(-,root,root)
-/usr/share/locale/ko/*
-
-%files nl
-%defattr(-,root,root)
-/usr/share/locale/nl/*
-
-%files no
-%defattr(-,root,root)
-/usr/share/locale/no/*
-
-%files pl
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/pl
-#/usr/share/doc/cups/pl/index.html
-#%dir /usr/share/cups/templates/pl
-#/usr/share/cups/templates/pl/*
-/usr/share/locale/pl/*
-
-%files pt
-%defattr(-,root,root)
-/usr/share/locale/pt/*
-/usr/share/locale/pt_BR/*
-
-%files ru
-%defattr(-,root,root)
-/usr/share/locale/ru/*
-
-%files sv
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/sv
-#/usr/share/doc/cups/sv/index.html
-#%dir /usr/share/cups/templates/sv
-#/usr/share/cups/templates/sv/*
-/usr/share/locale/sv/*
-
-%files zh
-%defattr(-,root,root)
-#%dir /usr/share/doc/cups/zh_TW
-#/usr/share/doc/cups/zh_TW/index.html
-#%dir /usr/share/cups/templates/zh_TW
-#/usr/share/cups/templates/zh_TW/*
-/usr/share/locale/zh/*
-/usr/share/locale/zh_TW/*
-
 %if %{?_with_php:1}%{!?_with_php:0}
 %files php
 # PHP