diff options
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/InstallationCheck | 10 | ||||
| -rw-r--r-- | packaging/cups.list.in | 192 | ||||
| -rw-r--r-- | packaging/cups.spec | 73 | ||||
| -rw-r--r-- | packaging/cups.spec.in | 69 |
4 files changed, 99 insertions, 245 deletions
diff --git a/packaging/InstallationCheck b/packaging/InstallationCheck index 4e3405ca..3458cbb5 100755 --- a/packaging/InstallationCheck +++ b/packaging/InstallationCheck @@ -1,11 +1,11 @@ #!/bin/sh case `uname -r` in - # Mac OS X 10.4.x - 8.*) exit 0;; + # OS X 10.7.x + 11.*) exit 0;; - # Mac OS X 10.5.x - 9.*) exit 0;; + # OS X 10.8.x + 12.*) exit 0;; - # Older Mac OS X... + # Older OS X... *) exit 97;; esac diff --git a/packaging/cups.list.in b/packaging/cups.list.in index e7967591..3e313b34 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -1,5 +1,5 @@ # -# "$Id: cups.list.in 10439 2012-04-23 23:49:19Z mike $" +# "$Id: cups.list.in 10456 2012-05-07 22:41:42Z mike $" # # ESP Package Manager (EPM) file list for CUPS. # @@ -225,9 +225,7 @@ $XINETD=@XINETD@ $LIB32DIR=@LIB32DIR@ $LIB64DIR=@LIB64DIR@ -$IMGFILTERS=@IMGFILTERS@ $MDNS=@MDNS@ -$PDFTOPS=@PDFTOPS@ $CUPS_USER=@CUPS_USER@ $CUPS_GROUP=@CUPS_GROUP@ @@ -243,6 +241,7 @@ $MAN7EXT=@MAN7EXT@ $MAN8EXT=@MAN8EXT@ $MAN8DIR=@MAN8DIR@ +$LIBZ=@LIBZ@ $DSOLIBS=@DSOLIBS@ # Make sure the MD5 password file is now owned by CUPS_USER... @@ -278,12 +277,10 @@ l 0700 root sys $SERVERBIN/backend/ipps ipp f 0500 root sys $SERVERBIN/backend/lpd backend/lpd %if DNSSD_BACKEND f 0500 root sys $SERVERBIN/backend/dnssd backend/dnssd +%system darwin l 0700 root sys $SERVERBIN/backend/mdns dnssd -%endif -%system !darwin -f 0555 root sys $SERVERBIN/backend/parallel backend/parallel %system all -f 0555 root sys $SERVERBIN/backend/serial backend/serial +%endif f 0555 root sys $SERVERBIN/backend/snmp backend/snmp f 0555 root sys $SERVERBIN/backend/socket backend/socket f 0555 root sys $SERVERBIN/backend/usb backend/usb @@ -299,27 +296,14 @@ f 0555 root sys $SERVERBIN/daemon/cups-driverd scheduler/cups-driverd f 0555 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld d 0755 root sys $SERVERBIN/driver - d 0755 root sys $SERVERBIN/filter - -f 0555 root sys $SERVERBIN/filter/bannertops filter/bannertops -f 0555 root sys $SERVERBIN/filter/commandtoespcx driver/commandtoescpx -f 0555 root sys $SERVERBIN/filter/commandtopclx driver/commandtopclx f 0555 root sys $SERVERBIN/filter/commandtops filter/commandtops f 0555 root sys $SERVERBIN/filter/gziptoany filter/gziptoany -%if IMGFILTERS -f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops -f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster -%endif -%if PDFTOPS -f 0555 root sys $SERVERBIN/filter/pdftops filter/pdftops -%endif f 0555 root sys $SERVERBIN/filter/pstops filter/pstops -f 0555 root sys $SERVERBIN/filter/rastertoespcx driver/rastertoescpx f 0555 root sys $SERVERBIN/filter/rastertolabel filter/rastertolabel l 0755 root sys $SERVERBIN/filter/rastertodymo rastertolabel f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp -f 0555 root sys $SERVERBIN/filter/rastertopclx driver/rastertopclx f 0555 root sys $SERVERBIN/filter/rastertopwg filter/rastertopwg -f 0555 root sys $SERVERBIN/filter/texttops filter/texttops d 0755 root sys $SERVERBIN/notifier - f 0555 root sys $SERVERBIN/notifier/mailto notifier/mailto @@ -427,42 +411,6 @@ l 0755 root sys $LIBDIR/libcupsppdc.so libcupsppdc.so.1 %subpackage %endif -%if LIB32DIR -%subpackage libs -f 0555 root sys $LIB32DIR/libcups.so.2 cups/libcups.32.so.2 nostrip() -l 0755 root sys $LIB32DIR/libcups.so libcups.so.2 -f 0555 root sys $LIB32DIR/libcupscgi.so.1 cgi-bin/libcupscgi.32.so.1 nostrip() -l 0755 root sys $LIB32DIR/libcupscgi.so libcupscgi.so.1 -f 0555 root sys $LIB32DIR/libcupsdriver.so.1 driver/libcupsdriver.32.so.1 nostrip() -l 0755 root sys $LIB32DIR/libcupsdriver.so libcupsdriver.so.1 -f 0555 root sys $LIB32DIR/libcupsimage.so.2 filter/libcupsimage.32.so.2 nostrip() -l 0755 root sys $LIB32DIR/libcupsimage.so libcupsimage.so.2 -f 0555 root sys $LIB32DIR/libcupsmime.so.1 scheduler/libcupsmime.32.so.1 nostrip() -l 0755 root sys $LIB32DIR/libcupsmime.so libcupsmime.so.1 -f 0555 root sys $LIB32DIR/libcupsppdc.so.1 ppdc/libcupsppdc.32.so.1 nostrip() -l 0755 root sys $LIB32DIR/libcupsppdc.so libcupsppdc.so.1 -%system all -%subpackage -%endif - -%if LIB64DIR -%subpackage libs -f 0555 root sys $LIB64DIR/libcups.so.2 cups/libcups.64.so.2 nostrip() -l 0755 root sys $LIB64DIR/libcups.so libcups.so.2 -f 0555 root sys $LIB64DIR/libcupscgi.so.1 cgi-bin/libcupscgi.64.so.1 nostrip() -l 0755 root sys $LIB64DIR/libcupscgi.so libcupscgi.so.1 -f 0555 root sys $LIB64DIR/libcupsdriver.so.1 driver/libcupsdriver.64.so.1 nostrip() -l 0755 root sys $LIB64DIR/libcupsdriver.so libcupsdriver.so.1 -f 0555 root sys $LIB64DIR/libcupsimage.so.2 filter/libcupsimage.64.so.2 nostrip() -l 0755 root sys $LIB64DIR/libcupsimage.so libcupsimage.so.2 -f 0555 root sys $LIB64DIR/libcupsmime.so.1 scheduler/libcupsmime.64.so.1 nostrip() -l 0755 root sys $LIB64DIR/libcupsmime.so libcupsmime.so.1 -f 0555 root sys $LIB64DIR/libcupsppdc.so.1 ppdc/libcupsppdc.64.so.1 nostrip() -l 0755 root sys $LIB64DIR/libcupsppdc.so libcupsppdc.so.1 -%system all -%subpackage -%endif - # Directories d 0755 root sys $LOGDIR - d 0710 root $CUPS_GROUP $REQUESTS - @@ -474,27 +422,27 @@ d 0755 root $CUPS_GROUP $STATEDIR - d 0511 root $CUPS_PRIMARY_SYSTEM_GROUP $STATEDIR/certs - # Data files -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/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/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/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/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/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/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 +#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/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/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 d 0755 root sys $DATADIR - @@ -506,11 +454,7 @@ f 0444 root sys $DATADIR/banners/standard data/standard f 0444 root sys $DATADIR/banners/topsecret data/topsecret f 0444 root sys $DATADIR/banners/unclassified data/unclassified -d 0755 root sys $DATADIR/charsets - -f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8 - d 0755 root sys $DATADIR/data - -f 0444 root sys $DATADIR/data/psglyphs data/psglyphs f 0444 root sys $DATADIR/data/testprint data/testprint d 0755 root sys $DATADIR/drv - @@ -519,15 +463,18 @@ f 0444 root sys $DATADIR/drv/sample.drv ppdc/sample.drv d 0755 root sys $DATADIR/examples - f 0444 root sys $DATADIR/examples examples/*.drv -d 0755 root sys $DATADIR/fonts - -f 0444 root sys $DATADIR/fonts fonts/Monospace* - d 0755 root sys $DATADIR/ipptool - f 0444 root sys $DATADIR/ipptool/create-printer-subscription.test test/create-printer-subscription.test f 0444 root sys $DATADIR/ipptool/get-completed-jobs.test test/get-completed-jobs.test f 0444 root sys $DATADIR/ipptool/get-jobs.test test/get-jobs.test +f 0444 root sys $DATADIR/ipptool/get-printer-attributes.test test/get-printer-attributes.test +f 0444 root sys $DATADIR/ipptool/print-job.test test/print-job.test +f 0444 root sys $DATADIR/ipptool test/document-*.p* f 0444 root sys $DATADIR/ipptool test/ipp-*.test +f 0444 root sys $DATADIR/ipptool test/onepage-*.p* f 0444 root sys $DATADIR/ipptool test/testfile.* +f 0444 root sys $DATADIR/ipptool/color.jpg test/color.jpg +f 0444 root sys $DATADIR/ipptool/gray.jpg test/gray.jpg d 0755 root sys $DATADIR/mime - f 0444 root sys $DATADIR/mime/mime.convs conf/mime.convs @@ -543,17 +490,17 @@ d 0755 root sys $DATADIR/templates - f 0444 root sys $DATADIR/templates templates/*.tmpl ## Template files -d 0755 root sys $DATADIR/templates/de -f 0444 root sys $DATADIR/templates/de templates/de/*.tmpl +#d 0755 root sys $DATADIR/templates/de +#f 0444 root sys $DATADIR/templates/de templates/de/*.tmpl -d 0755 root sys $DATADIR/templates/es -f 0444 root sys $DATADIR/templates/es templates/es/*.tmpl +#d 0755 root sys $DATADIR/templates/es +#f 0444 root sys $DATADIR/templates/es templates/es/*.tmpl #d 0755 root sys $DATADIR/templates/et #f 0444 root sys $DATADIR/templates/et templates/et/*.tmpl -d 0755 root sys $DATADIR/templates/eu -f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl +#d 0755 root sys $DATADIR/templates/eu +#f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl #d 0755 root sys $DATADIR/templates/fr #f 0444 root sys $DATADIR/templates/fr templates/fr/*.tmpl @@ -561,20 +508,20 @@ f 0444 root sys $DATADIR/templates/eu templates/eu/*.tmpl #d 0755 root sys $DATADIR/templates/he #f 0444 root sys $DATADIR/templates/he templates/he/*.tmpl -d 0755 root sys $DATADIR/templates/id -f 0444 root sys $DATADIR/templates/id templates/id/*.tmpl +#d 0755 root sys $DATADIR/templates/id +#f 0444 root sys $DATADIR/templates/id templates/id/*.tmpl -d 0755 root sys $DATADIR/templates/it -f 0444 root sys $DATADIR/templates/it templates/it/*.tmpl +#d 0755 root sys $DATADIR/templates/it +#f 0444 root sys $DATADIR/templates/it templates/it/*.tmpl -d 0755 root sys $DATADIR/templates/ja -f 0444 root sys $DATADIR/templates/ja templates/ja/*.tmpl +#d 0755 root sys $DATADIR/templates/ja +#f 0444 root sys $DATADIR/templates/ja templates/ja/*.tmpl -d 0755 root sys $DATADIR/templates/pl -f 0444 root sys $DATADIR/templates/pl templates/pl/*.tmpl +#d 0755 root sys $DATADIR/templates/pl +#f 0444 root sys $DATADIR/templates/pl templates/pl/*.tmpl -d 0755 root sys $DATADIR/templates/ru -f 0444 root sys $DATADIR/templates/ru templates/ru/*.tmpl +#d 0755 root sys $DATADIR/templates/ru +#f 0444 root sys $DATADIR/templates/ru templates/ru/*.tmpl #d 0755 root sys $DATADIR/templates/sv #f 0444 root sys $DATADIR/templates/sv templates/sv/*.tmpl @@ -587,8 +534,9 @@ d 0755 root sys $SERVERROOT - d 0755 root $CUPS_GROUP $SERVERROOT/interfaces - d 0755 root $CUPS_GROUP $SERVERROOT/ppd - d 0700 root $CUPS_GROUP $SERVERROOT/ssl - -c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/ conf/*.conf +c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf conf/cupsd.conf f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf +c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/snmp.conf conf/snmp.conf %if PAMDIR d 0755 root sys $PAMDIR - @@ -604,24 +552,19 @@ f 0444 root sys $INCLUDEDIR/cups/array.h cups/array.h f 0444 root sys $INCLUDEDIR/cups/backend.h cups/backend.h f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h f 0444 root sys $INCLUDEDIR/cups/dir.h cups/dir.h -f 0444 root sys $INCLUDEDIR/cups/driver.h driver/driver.h f 0444 root sys $INCLUDEDIR/cups/file.h cups/file.h f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h -f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h -f 0444 root sys $INCLUDEDIR/cups/mime.h scheduler/mime.h f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h f 0444 root sys $INCLUDEDIR/cups/raster.h cups/raster.h +f 0444 root sys $INCLUDEDIR/cups/sidechannel.h cups/sidechannel.h f 0444 root sys $INCLUDEDIR/cups/transcode.h cups/transcode.h +f 0444 root sys $INCLUDEDIR/cups/versioning.h cups/versioning.h %if INSTALLSTATIC f 0444 root sys $LIBDIR/libcups.a cups/libcups.a -f 0444 root sys $LIBDIR/libcupscgi.a cgi-bin/libcupscgi.a -f 0444 root sys $LIBDIR/libcupsdriver.a driver/libcupsdriver.a f 0444 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a -f 0444 root sys $LIBDIR/libcupsmime.a scheduler/libcupsmime.a -f 0444 root sys $LIBDIR/libcupsppdc.a ppdc/libcupsppdc.a %endif d 0755 root sys $DOCDIR/help - @@ -660,17 +603,17 @@ f 0444 root sys $DOCDIR/images doc/images/*.png f 0444 root sys $DOCDIR/robots.txt doc/robots.txt # Localized documentation files -d 0755 root sys $DOCDIR/de -f 0444 root sys $DOCDIR/de doc/de/*.html +#d 0755 root sys $DOCDIR/de +#f 0444 root sys $DOCDIR/de doc/de/*.html -d 0755 root sys $DOCDIR/es -f 0444 root sys $DOCDIR/es doc/es/*.html +#d 0755 root sys $DOCDIR/es +#f 0444 root sys $DOCDIR/es doc/es/*.html #d 0755 root sys $DOCDIR/et #f 0444 root sys $DOCDIR/et doc/et/*.html -d 0755 root sys $DOCDIR/eu -f 0444 root sys $DOCDIR/eu doc/eu/*.html +#d 0755 root sys $DOCDIR/eu +#f 0444 root sys $DOCDIR/eu doc/eu/*.html #d 0755 root sys $DOCDIR/fr #f 0444 root sys $DOCDIR/fr doc/fr/*.html @@ -679,20 +622,20 @@ f 0444 root sys $DOCDIR/eu doc/eu/*.html #f 0444 root sys $DOCDIR/he doc/he/*.html #f 0444 root sys $DOCDIR/he/cups.css doc/he/cups.css -d 0755 root sys $DOCDIR/id -f 0444 root sys $DOCDIR/id doc/id/*.html +#d 0755 root sys $DOCDIR/id +#f 0444 root sys $DOCDIR/id doc/id/*.html -d 0755 root sys $DOCDIR/it -f 0444 root sys $DOCDIR/it doc/it/*.html +#d 0755 root sys $DOCDIR/it +#f 0444 root sys $DOCDIR/it doc/it/*.html -d 0755 root sys $DOCDIR/ja -f 0444 root sys $DOCDIR/ja doc/ja/*.html +#d 0755 root sys $DOCDIR/ja +#f 0444 root sys $DOCDIR/ja doc/ja/*.html -d 0755 root sys $DOCDIR/pl -f 0444 root sys $DOCDIR/pl doc/pl/*.html +#d 0755 root sys $DOCDIR/pl +#f 0444 root sys $DOCDIR/pl doc/pl/*.html -d 0755 root sys $DOCDIR/ru -f 0444 root sys $DOCDIR/ru doc/ru/*.html +#d 0755 root sys $DOCDIR/ru +#f 0444 root sys $DOCDIR/ru doc/ru/*.html #d 0755 root sys $DOCDIR/sv #f 0444 root sys $DOCDIR/sv doc/sv/*.html @@ -721,6 +664,7 @@ f 0444 root sys $MANDIR/man1/lpstat.$MAN1EXT man/lpstat.$MAN1EXT f 0444 root sys $MANDIR/man1/lp.$MAN1EXT man/lp.$MAN1EXT f 0444 root sys $MANDIR/man5/classes.conf.$MAN5EXT man/classes.conf.$MAN5EXT +f 0444 root sys $MANDIR/man5/cups-snmp.conf.$MAN5EXT man/cups-snmp.conf.$MAN5EXT f 0444 root sys $MANDIR/man5/cupsd.conf.$MAN5EXT man/cupsd.conf.$MAN5EXT f 0444 root sys $MANDIR/man5/ipptoolfile.$MAN5EXT man/ipptoolfile.$MAN5EXT f 0444 root sys $MANDIR/man5/mailto.conf.$MAN5EXT man/mailto.conf.$MAN5EXT @@ -734,7 +678,7 @@ l 0644 root sys $AMANDIR/man$MAN8DIR/cupsreject.$MAN8EXT cupsaccept.$MAN8EXT f 0444 root sys $AMANDIR/man$MAN8DIR/cupsaddsmb.$MAN8EXT man/cupsaddsmb.$MAN8EXT f 0444 root sys $AMANDIR/man$MAN8DIR/cupsctl.$MAN8EXT man/cupsctl.$MAN8EXT f 0444 root sys $AMANDIR/man$MAN8DIR/cupsfilter.$MAN8EXT man/cupsfilter.$MAN8EXT -f 0444 root sys $AMANDIR/man$MAN8DIR/cups-polld.$MAN8EXT man/cups-polld.$MAN8EXT +f 0444 root sys $AMANDIR/man$MAN8DIR/cups-snmp.$MAN8EXT man/cups-snmp.$MAN8EXT f 0444 root sys $AMANDIR/man$MAN8DIR/cupsd.$MAN8EXT man/cupsd.$MAN8EXT f 0444 root sys $AMANDIR/man$MAN8DIR/cupsenable.$MAN8EXT man/cupsenable.$MAN8EXT l 0644 root sys $AMANDIR/man$MAN8DIR/cupsdisable.$MAN8EXT cupsenable.$MAN8EXT @@ -796,5 +740,5 @@ f 0444 root sys $XINETD/cups-lpd scheduler/cups-lpd.xinetd %subpackage # -# End of "$Id: cups.list.in 10439 2012-04-23 23:49:19Z mike $". +# End of "$Id: cups.list.in 10456 2012-05-07 22:41:42Z mike $". # diff --git a/packaging/cups.spec b/packaging/cups.spec index 8e37f5ad..018a8709 100644 --- a/packaging/cups.spec +++ b/packaging/cups.spec @@ -1,5 +1,5 @@ # -# "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $" +# "$Id: cups.spec.in 10534 2012-06-22 02:50:27Z mike $" # # RPM "spec" file for CUPS. # @@ -18,34 +18,29 @@ # Conditional build options (--with name/--without name): # # dbus - Enable/disable DBUS support (default = enable) -# dnssd - Enable/disable DNS-SD support (default = disable) -# php - Enable/disable PHP support (default = enable) +# dnssd - Enable/disable DNS-SD support (default = enable) # static - Enable/disable static libraries (default = enable) %{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}} %{?_with_dbus: %define _dbus --enable-dbus} %{!?_with_dbus: %define _dbus --disable-dbus} -%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}} +%{!?_with_dnssd: %{!?_without_dnssd: %define _without_dnssd --without-dnssd}} %{?_with_dnssd: %define _dnssd --enable-dnssd} %{!?_with_dnssd: %define _dnssd --disable-dnssd} -%{!?_with_php: %{!?_without_php: %define _with_php --with-php}} -%{?_with_php: %define _php --with-php} -%{!?_with_php: %define _php --without-php} - %{!?_with_static: %{!?_without_static: %define _without_static --without-static}} %{?_with_static: %define _static --enable-static} %{!?_with_static: %define _static --disable-static} Summary: CUPS Name: cups -Version: 1.5.4 +Version: 1.6.0 Release: 1 Epoch: 1 License: GPL Group: System Environment/Daemons -Source: http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2 +Source: http://ftp.easysw.com/pub/cups/1.6.0/cups-1.6.0-source.tar.bz2 Url: http://www.cups.org Packager: Anonymous <anonymous@foo.com> Vendor: Apple Inc. @@ -76,13 +71,6 @@ Summary: CUPS - LPD support Group: System Environment/Daemons Requires: %{name} = %{epoch}:%{version} xinetd -%if %{?_with_php:1}%{!?_with_php:0} -%package php -Summary: CUPS - PHP support -Group: Development/Languages -Requires: %{name}-libs = %{epoch}:%{version} -%endif - %description CUPS is the standards-based, open source printing system developed by Apple Inc. for OS X and other UNIX®-like operating systems. @@ -96,17 +84,12 @@ This package provides the CUPS shared libraries. %description lpd This package provides LPD client support. -%if %{?_with_php:1}%{!?_with_php:0} -%description php -This package provides PHP support for CUPS. -%endif - %prep %setup %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ - ./configure %{_dbus} %{_dnssd} %{_php} %{_static} + ./configure %{_dbus} %{_dnssd} %{_static} # If we got this far, all prerequisite libraries must be here. make @@ -203,8 +186,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0700,root,root) /usr/lib/cups/backend/ipp /usr/lib/cups/backend/ipps %attr(0700,root,root) /usr/lib/cups/backend/lpd -/usr/lib/cups/backend/parallel -/usr/lib/cups/backend/serial /usr/lib/cups/backend/snmp /usr/lib/cups/backend/socket /usr/lib/cups/backend/usb @@ -214,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/cups/daemon/cups-deviced /usr/lib/cups/daemon/cups-driverd /usr/lib/cups/daemon/cups-exec -/usr/lib/cups/daemon/cups-polld %dir /usr/lib/cups/driver %dir /usr/lib/cups/filter /usr/lib/cups/filter/* @@ -227,14 +207,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/cups %dir /usr/share/cups/banners /usr/share/cups/banners/* -%dir /usr/share/cups/charsets -/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/ipptool /usr/share/cups/ipptool/* %dir /usr/share/cups/mime @@ -246,26 +222,6 @@ 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/fr -/usr/share/doc/cups/fr/* -%dir /usr/share/doc/cups/hu -/usr/share/doc/cups/hu/* -%dir /usr/share/doc/cups/id -/usr/share/doc/cups/id/* -%dir /usr/share/doc/cups/it -/usr/share/doc/cups/it/* -%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 @@ -285,7 +241,12 @@ 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/doc/cups/ja +/usr/share/doc/cups/ja/* + +%dir /usr/share/locale/ja +/usr/share/locale/ja/cups_ja.po %dir /usr/share/man/man1 /usr/share/man/man1/cancel.1.gz @@ -315,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man8/cupsreject.8.gz /usr/share/man/man8/cups-deviced.8.gz /usr/share/man/man8/cups-driverd.8.gz -/usr/share/man/man8/cups-polld.8.gz +/usr/share/man/man8/cups-snmp.8.gz /usr/share/man/man8/lpadmin.8.gz /usr/share/man/man8/lpc.8.gz /usr/share/man/man8/lpinfo.8.gz @@ -377,13 +338,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/man/man8 /usr/share/man/man8/cups-lpd.8.gz -%if %{?_with_php:1}%{!?_with_php:0} -%files php -# PHP -/usr/lib*/php* -%endif - # -# End of "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $". +# End of "$Id: cups.spec.in 10534 2012-06-22 02:50:27Z mike $". # diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 004258a1..a17c5161 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -1,5 +1,5 @@ # -# "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $" +# "$Id: cups.spec.in 10534 2012-06-22 02:50:27Z mike $" # # RPM "spec" file for CUPS. # @@ -18,22 +18,17 @@ # Conditional build options (--with name/--without name): # # dbus - Enable/disable DBUS support (default = enable) -# dnssd - Enable/disable DNS-SD support (default = disable) -# php - Enable/disable PHP support (default = enable) +# dnssd - Enable/disable DNS-SD support (default = enable) # static - Enable/disable static libraries (default = enable) %{!?_with_dbus: %{!?_without_dbus: %define _with_dbus --with-dbus}} %{?_with_dbus: %define _dbus --enable-dbus} %{!?_with_dbus: %define _dbus --disable-dbus} -%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}} +%{!?_with_dnssd: %{!?_without_dnssd: %define _without_dnssd --without-dnssd}} %{?_with_dnssd: %define _dnssd --enable-dnssd} %{!?_with_dnssd: %define _dnssd --disable-dnssd} -%{!?_with_php: %{!?_without_php: %define _with_php --with-php}} -%{?_with_php: %define _php --with-php} -%{!?_with_php: %define _php --without-php} - %{!?_with_static: %{!?_without_static: %define _without_static --without-static}} %{?_with_static: %define _static --enable-static} %{!?_with_static: %define _static --disable-static} @@ -76,13 +71,6 @@ Summary: CUPS - LPD support Group: System Environment/Daemons Requires: %{name} = %{epoch}:%{version} xinetd -%if %{?_with_php:1}%{!?_with_php:0} -%package php -Summary: CUPS - PHP support -Group: Development/Languages -Requires: %{name}-libs = %{epoch}:%{version} -%endif - %description CUPS is the standards-based, open source printing system developed by Apple Inc. for OS X and other UNIX®-like operating systems. @@ -96,17 +84,12 @@ This package provides the CUPS shared libraries. %description lpd This package provides LPD client support. -%if %{?_with_php:1}%{!?_with_php:0} -%description php -This package provides PHP support for CUPS. -%endif - %prep %setup %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \ - ./configure %{_dbus} %{_dnssd} %{_php} %{_static} + ./configure %{_dbus} %{_dnssd} %{_static} # If we got this far, all prerequisite libraries must be here. make @@ -203,8 +186,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0700,root,root) /usr/lib/cups/backend/ipp /usr/lib/cups/backend/ipps %attr(0700,root,root) /usr/lib/cups/backend/lpd -/usr/lib/cups/backend/parallel -/usr/lib/cups/backend/serial /usr/lib/cups/backend/snmp /usr/lib/cups/backend/socket /usr/lib/cups/backend/usb @@ -214,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/cups/daemon/cups-deviced /usr/lib/cups/daemon/cups-driverd /usr/lib/cups/daemon/cups-exec -/usr/lib/cups/daemon/cups-polld %dir /usr/lib/cups/driver %dir /usr/lib/cups/filter /usr/lib/cups/filter/* @@ -227,14 +207,10 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/cups %dir /usr/share/cups/banners /usr/share/cups/banners/* -%dir /usr/share/cups/charsets -/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/ipptool /usr/share/cups/ipptool/* %dir /usr/share/cups/mime @@ -246,26 +222,6 @@ 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/fr -/usr/share/doc/cups/fr/* -%dir /usr/share/doc/cups/hu -/usr/share/doc/cups/hu/* -%dir /usr/share/doc/cups/id -/usr/share/doc/cups/id/* -%dir /usr/share/doc/cups/it -/usr/share/doc/cups/it/* -%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 @@ -285,7 +241,12 @@ 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/doc/cups/ja +/usr/share/doc/cups/ja/* + +%dir /usr/share/locale/ja +/usr/share/locale/ja/cups_ja.po %dir /usr/share/man/man1 /usr/share/man/man1/cancel.1.gz @@ -315,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man8/cupsreject.8.gz /usr/share/man/man8/cups-deviced.8.gz /usr/share/man/man8/cups-driverd.8.gz -/usr/share/man/man8/cups-polld.8.gz +/usr/share/man/man8/cups-snmp.8.gz /usr/share/man/man8/lpadmin.8.gz /usr/share/man/man8/lpc.8.gz /usr/share/man/man8/lpinfo.8.gz @@ -377,13 +338,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/man/man8 /usr/share/man/man8/cups-lpd.8.gz -%if %{?_with_php:1}%{!?_with_php:0} -%files php -# PHP -/usr/lib*/php* -%endif - # -# End of "$Id: cups.spec.in 10428 2012-04-23 17:46:53Z mike $". +# End of "$Id: cups.spec.in 10534 2012-06-22 02:50:27Z mike $". # |