Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / packaging / cups.spec.in

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index c9b22430fb1b23d0f59e23f7e9cae1d4b8ae3c56..26d0ac8a19b2ffc55fc7d17c86f8ff0b473edb51 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,11 +1,11 @@
 #
 # "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $"
 #
-#   RPM "spec" file for the Common UNIX Printing System (CUPS).
+#   RPM "spec" file for CUPS.
 #
 #   Original version by Jason McMullan <jmcc@ontv.com>.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1999-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -32,7 +32,7 @@
 %{?_with_static: %define _static --enable-static}
 %{!?_with_static: %define _static --disable-static}
 
-Summary: Common UNIX Printing System
+Summary: CUPS
 Name: cups
 Version: @CUPS_VERSION@
 Release: 0
@@ -56,63 +56,51 @@ Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl
 Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh
 
 %package devel
-Summary: Common UNIX Printing System - development environment
+Summary: CUPS - development environment
 Group: Development/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}
 
 %package libs
-Summary: Common UNIX Printing System - shared libraries
+Summary: CUPS - shared libraries
 Group: System Environment/Libraries
 Provides: libcups1
 
 %package lpd
-Summary: Common UNIX Printing System - LPD support
+Summary: CUPS - LPD support
 Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version} xinetd
 
 %if %{?_with_php:1}%{!?_with_php:0}
 %package php
-Summary: Common UNIX Printing System - PHP support
+Summary: CUPS - PHP support
 Group: Development/Languages
 Requires: %{name}-libs = %{epoch}:%{version}
 %endif
 
 %description
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. It was developed by Easy Software Products 
-to promote a standard printing solution for all UNIX vendors and users
-and is now owned by Apple Inc.  CUPS provides the System V and Berkeley
-command-line interfaces. 
+CUPS is the standards-based, open source printing system developed by
+Apple Inc. for Mac OS¨ X and other UNIX¨-like operating systems.
 
 %description devel
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This is the development package for creating
-additional printer drivers and other CUPS services.
+This package provides the CUPS headers and development environment.
 
 %description libs
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package contains the CUPS shared libraries.
+This package provides the CUPS shared libraries.
 
 %description lpd
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package provides LPD client support.
+This package provides LPD client support.
 
 %if %{?_with_php:1}%{!?_with_php:0}
 %description php
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package provides PHP support.
+This package provides PHP support for CUPS.
 %endif
 
 %prep
 %setup
 
 %build
-%ifarch x86_64
-./configure --enable-32bit %{_dbus} %{_php} %{_static}
-%else
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
     ./configure %{_dbus} %{_php} %{_static}
-%endif
 # If we got this far, all prerequisite libraries must be here.
 make
 
@@ -197,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/cancel
 /usr/bin/cupstestdsc
 /usr/bin/cupstestppd
+/usr/bin/ipptest
 /usr/bin/lp*
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
@@ -237,6 +226,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/cups/drv/*
 %dir /usr/share/cups/fonts
 /usr/share/cups/fonts/*
+%dir /usr/share/cups/ipptest
+/usr/share/cups/ipptest/*
 %dir /usr/share/cups/mime
 /usr/share/cups/mime/*
 %dir /usr/share/cups/model
@@ -246,6 +237,20 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/cups/templates/*
 %dir /usr/share/doc/cups
 /usr/share/doc/cups/*.*
+%dir /usr/share/doc/cups/de
+/usr/share/doc/cups/de/*
+%dir /usr/share/doc/cups/es
+/usr/share/doc/cups/es/*
+%dir /usr/share/doc/cups/eu
+/usr/share/doc/cups/eu/*
+%dir /usr/share/doc/cups/id
+/usr/share/doc/cups/id/*
+%dir /usr/share/doc/cups/ja
+/usr/share/doc/cups/ja/*
+%dir /usr/share/doc/cups/pl
+/usr/share/doc/cups/pl/*
+%dir /usr/share/doc/cups/ru
+/usr/share/doc/cups/ru/*
 %dir /usr/share/doc/cups/help
 /usr/share/doc/cups/help/accounting.html
 /usr/share/doc/cups/help/cgi.html
@@ -259,6 +264,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/cups/help/policies.html
 /usr/share/doc/cups/help/ref-*.html
 /usr/share/doc/cups/help/security.html
+/usr/share/doc/cups/help/sharing.html
 /usr/share/doc/cups/help/standard.html
 /usr/share/doc/cups/help/translation.html
 /usr/share/doc/cups/help/whatsnew.html
@@ -270,6 +276,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/cancel.1.gz
 /usr/share/man/man1/cupstestdsc.1.gz
 /usr/share/man/man1/cupstestppd.1.gz
+/usr/share/man/man1/ipptest.1.gz
 /usr/share/man/man1/lp.1.gz
 /usr/share/man/man1/lpoptions.1.gz
 /usr/share/man/man1/lppasswd.1.gz
@@ -279,11 +286,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/lpstat.1.gz
 %dir /usr/share/man/man5
 /usr/share/man/man5/*.conf.5.gz
+/usr/share/man/man5/ipp.test.5.gz
 /usr/share/man/man5/mime.*.5.gz
 %dir /usr/share/man/man7
-/usr/share/man/man7/commandto*
 /usr/share/man/man7/drv*
-/usr/share/man/man7/rasterto*
 %dir /usr/share/man/man8
 /usr/share/man/man8/accept.8.gz
 /usr/share/man/man8/cupsaddsmb.8.gz
@@ -326,6 +332,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man5/ppdcfile.5.gz
 /usr/share/man/man7/backend.7.gz
 /usr/share/man/man7/filter.7.gz
+/usr/share/man/man7/notifier.7.gz
 
 /usr/bin/cups-config
 /usr/bin/ppd*