cups-1.4.6-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3065 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cups/cups-vl.spec

@@ -7,8 +7,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.11
-Release: 6%{?_dist_release}
+Version: 1.4.6
+Release: 1%{?_dist_release}
 License: GPL
 Group: System Environment/Daemons
 
@@ -16,21 +16,32 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke, tomop
 
-Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
+Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
+# Our initscript
 Source1: cups.init
+# Pixmap for desktop file
 Source2: cupsprinter.png
-Source3: http://www.openprinting.org/download/printing/dnssd
+# udev rules for libusb devices
+Source3: cups-libusb.rules
+# LSPP-required ps->pdf filter
 Source4: pstopdf
+# xinetd config file for cups-lpd service
 Source5: cups-lpd
-Source6: pstoraster
-Source7: pstoraster.convs
-Source8: postscript.ppd.gz
-Source9: cups.logrotate
-Source10: ncp.backend
-Source12: cups.cron
-Source13: pdftops.conf
-Source14: textonly.filter
-Source15: textonly.ppd
+# Logrotate configuration
+Source6: cups.logrotate
+# Backend for NCP protocol
+Source7: ncp.backend
+# Cron-based tmpwatch for /var/spool/cups/tmp
+Source8: cups.cron
+# Filter and PPD for textonly printing
+Source9: textonly.filter
+Source10: textonly.ppd
+
+Source101: http://www.openprinting.org/download/printing/dnssd
+Source102: pstoraster
+Source103: pstoraster.convs
+Source104: postscript.ppd.gz
+Source105: pdftops.conf
 
 Source201: dvitops
 Source202: dvitops.convs
@@ -40,63 +51,73 @@ Source206: pxlmono.ppd.gz
 Source207: pxlcolor.ppd.gz
 Source208: cups.conf
 
-
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
-Patch6: cups-banners.patch
-Patch7: cups-serverbin-compat.patch
-Patch8: cups-no-export-ssllibs.patch
-Patch9: cups-paps.patch
-Patch10: cups-wbuffer.patch
-Patch11: cups-direct-usb.patch
-Patch12: cups-lpr-help.patch
-Patch13: cups-peercred.patch
-Patch14: cups-pid.patch
-Patch15: cups-foomatic-recommended.patch
-Patch16: cups-eggcups.patch
-Patch17: cups-getpass.patch
-Patch18: cups-driverd-timeout.patch
-Patch19: cups-strict-ppd-line-length.patch
-Patch20: cups-logrotate.patch
-Patch21: cups-usb-paperout.patch
-Patch22: cups-getnameddest.patch
-Patch23: cups-str2101.patch
-
-# Vine Patch
-# use mpage for text-ps filter instead of texttops
-Patch210: cups-1.3.7-cjktexttops.patch
-
-# security fixes
-Patch300: cups-1.3.8-CVE-2010-0393.patch
-Patch310: cups-1.3.x_CVE-2010-0540.patch
-Patch320: cups-1.3.11_CVE-2010-0542.patch
-Patch330: cups-1.3.11_CVE-2010-1748.patch
-Patch340: cups-CVE-2009-2820.patch
-Patch350: cups-CVE-2009-3553.patch
+Patch4: cups-serial.patch
+Patch5: cups-banners.patch
+Patch6: cups-serverbin-compat.patch
+Patch7: cups-no-export-ssllibs.patch
+Patch8: cups-direct-usb.patch
+Patch9: cups-lpr-help.patch
+Patch10: cups-peercred.patch
+Patch11: cups-pid.patch
+Patch12: cups-page-label.patch
+Patch13: cups-eggcups.patch
+Patch14: cups-getpass.patch
+Patch15: cups-driverd-timeout.patch
+Patch16: cups-strict-ppd-line-length.patch
+Patch17: cups-logrotate.patch
+Patch18: cups-usb-paperout.patch
+Patch19: cups-build.patch
+Patch20: cups-res_init.patch
+Patch21: cups-filter-debug.patch
+Patch22: cups-uri-compat.patch
+Patch23: cups-cups-get-classes.patch
+Patch25: cups-str3382.patch
+Patch26: cups-force-gnutls.patch
+Patch27: cups-serialize-gnutls.patch
+Patch29: cups-0755.patch
+Patch31: cups-hostnamelookups.patch
+Patch33: cups-snmp-quirks.patch
+Patch34: cups-hp-deviceid-oid.patch
+Patch35: cups-dnssd-deviceid.patch
+Patch36: cups-ricoh-deviceid-oid.patch
+Patch37: cups-texttops-rotate-page.patch
+Patch38: cups-autotype-crash.patch
+Patch39: cups-str3754.patch
+Patch40: cups-avahi.patch
+Patch41: cups-icc.patch
+Patch42: cups-usb-parallel.patch
+Patch43: cups-job-state-changed.patch
+
+Patch100: cups-1.4.6-fix-template-ja.patch
 
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-root
-PreReq: chkconfig initscripts perl alternatives
+Requires(pre): chkconfig initscripts perl alternatives
 Requires: %{name}-libs = %{version}-%{release}
 Requires: tmpwatch
 %if %use_alternatives
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
-Prereq: alternatives
+Requires(pre): alternatives
 %else
 Obsoletes: lpd lpr LPRng printtool
 Provides: lpd lpr LPRng
 %endif
-BuildPrereq: pam-devel pkgconfig
+BuildRequires: pam-devel pkgconfig
+BuildRequires: gnutls-devel
+BuildRequires: libacl-devel
+BuildRequires: openldap-devel
 BuildRequires: aspell-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: openldap-devel
-BuildRequires: gnutls-devel
 BuildRequires: krb5-devel
+BuildRequires: e2fsprogs-devel
+BuildRequires: poppler-utils
 %if %use_dbus
-BuildPrereq: dbus-devel >= 0.90
+BuildRequires: dbus-devel >= 0.90
 Requires: dbus >= 0.90
 %endif
 
@@ -106,6 +127,8 @@ Requires: avahi >= 0.6.20
 Requires: avahi-tools
 %endif
 
+Requires: poppler-utils
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -187,36 +210,94 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
 %prep
 %setup -q -n %{name}-%{version}
 
+# Don't gzip man pages in the Makefile, let rpmbuild do it.
 %patch1 -p1 -b .no-gzip-man
+# Use the system pam configuration.
 %patch2 -p1 -b .system-auth
+# Prevent multilib conflict in cups-config script.
 %patch3 -p1 -b .multilib
-%patch6 -p1 -b .banners
-%patch7 -p1 -b .serverbin-compat
-%patch8 -p1 -b .no-export-ssllibs
-%patch9 -p1 -b .paps
-%patch10 -p1 -b .wbuffer
-%patch11 -p1 -b .direct-usb
-%patch12 -p1 -b .lpr-help
-%patch13 -p1 -b .peercred
-%patch14 -p1 -b .pid
-%patch15 -p1 -b .foomatic-recommended
-%patch16 -p1 -b .eggcups
-%patch17 -p1 -b .getpass
-%patch18 -p1 -b .driverd-timeout
-%patch19 -p1 -b .strict-ppd-line-length
-%patch20 -p1 -b .logrotate
-%patch21 -p1 -b .usb-paperout
-%patch22 -p1 -b .getnameddest
-%patch23 -p1 -b .str2101
-
-%patch210 -p1 -b .cjktexttops
-
-%patch300 -p1 -b .CVE-2010-0393
-%patch310 -p0 -b .CVE-2010-0540
-%patch340 -p1 -b .CVE-2009-2820
-%patch350 -p1 -b .CVE-2009-3553
-%patch320 -p1 -b .CVE-2010-0542
-%patch330 -p1 -b .CVE-2010-1748
+# Fix compilation of serial backend.
+%patch4 -p1 -b .serial
+# Ignore rpm save/new files in the banners directory.
+%patch5 -p1 -b .banners
+# Use compatibility fallback path for ServerBin.
+%patch6 -p1 -b .serverbin-compat
+# Don't export SSLLIBS to cups-config.
+%patch7 -p1 -b .no-export-ssllibs
+# Allow file-based usb device URIs.
+%patch8 -p1 -b .direct-usb
+# Add --help option to lpr.
+%patch9 -p1 -b .lpr-help
+# Fix compilation of peer credentials support.
+%patch10 -p1 -b .peercred
+# Maintain a cupsd.pid file.
+%patch11 -p1 -b .pid
+# Fix orientation of page labels.
+%patch12 -p1 -b .page-label
+# Fix implementation of com.redhat.PrinterSpooler D-Bus object.
+%patch13 -p1 -b .eggcups
+# More sophisticated implementation of cupsGetPassword than getpass.
+%patch14 -p1 -b .getpass
+# Increase driverd timeout to 70s to accommodate foomatic.
+%patch15 -p1 -b .driverd-timeout
+# Only enforce maximum PPD line length when in strict mode.
+%patch16 -p1 -b .strict-ppd-line-length
+# Re-open the log if it has been logrotated under us.
+%patch17 -p1 -b .logrotate
+# Support for errno==ENOSPACE-based USB paper-out reporting.
+%patch18 -p1 -b .usb-paperout
+# Simplify the DNSSD parts so they can build using the compat library.
+%patch19 -p1 -b .build
+# Re-initialise the resolver on failure in httpAddrGetList().
+%patch20 -p1 -b .res_init
+# Log extra debugging information if no filters are available.
+%patch21 -p1 -b .filter-debug
+# Allow the usb backend to understand old-style URI formats.
+%patch22 -p1 -b .uri-compat
+# Fix support for older CUPS servers in cupsGetDests.
+%patch23 -p1 -b .cups-get-classes
+# Fix temporary filename creation.
+%patch25 -p1 -b .str3382
+# Force the use of gnutls despite thread-safety concerns (bug #607159).
+%patch26 -p1 -b .force-gnutls
+# Perform locking for gnutls and avoid libgcrypt's broken
+# locking (bug #607159).
+%patch27 -p1 -b .serialize-gnutls
+# Use mode 0755 for binaries and libraries where appropriate.
+%patch29 -p1 -b .0755
+# Use numeric addresses for interfaces unless HostNameLookups are
+# turned on (bug #583054).
+%patch31 -p1 -b .hostnamelookups
+# Handle SNMP supply level quirks (bug #581825).
+%patch33 -p1 -b .snmp-quirks
+# Add an SNMP query for HP's device ID OID (STR #3552).
+%patch34 -p1 -b .hp-deviceid-oid
+# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
+%patch35 -p1 -b .dnssd-deviceid
+# Add an SNMP query for Ricoh's device ID OID (STR #3552).
+%patch36 -p1 -b .ricoh-deviceid-oid
+# Adjust texttops output to be in natural orientation (STR #3563).
+# This fixes page-label orientation when texttops is used in the
+# filter chain (bug #572338).
+%patch37 -p1 -b .texttops-rotate-page
+# Don't crash when MIME database could not be loaded (bug #610088).
+%patch38 -p1 -b .autotype-crash
+# Don't crash when job queued for printer that times out (bug #660604).
+%patch39 -p1 -b .str3754
+# Avahi support in the dnssd backend.
+%patch40 -p1 -b .avahi
+# ICC colord support.
+%patch41 -p1 -b .icc
+# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
+%patch42 -p1 -b .usb-parallel
+# Fixed dbus notifier support for job-state-changed.
+%patch43 -p1 -b .job-state-changed
+
+%patch100 -p1 -b .template-ja
+
+# make to use cjktexttops instead texttops.
+perl -pi -e 's/texttops$/cjktexttops/' conf/mime.convs.in
+
 
 perl -pi -e 's,^#(DefaultCharset\s)utf-8,$1notused,' conf/cupsd.conf.in
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
@@ -230,22 +311,33 @@ perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
 # Let's look at the compilation command lines.
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
-%build
-if pkg-config openssl ; then
-  export CFLAGS=`pkg-config --cflags openssl`
-  export CPPFLAGS=`pkg-config --cflags-only-I openssl`
-  export LDFLAGS=`pkg-config --libs-only-L openssl`
-fi
+# Fix locale code for Norwegian (bug #520379).
+mv locale/cups_no.po locale/cups_nb.po
 
-%if %use_avahi
-export CPPFLAGS="$CPPFLAGS -I/usr/include/avahi-compat-libdns_sd"
-%endif
+f=CREDITS.txt
+mv "$f" "$f"~
+iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f"
+rm "$f"~
+
+# Rebuild configure script for --enable-avahi.
+aclocal -I config-scripts
+autoconf -I config-scripts
 
-%configure --with-docdir=%{_datadir}/%{name}/www \
-	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
+%build
+
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
+# --enable-debug to avoid stripping binaries
+%configure --with-docdir=%{_datadir}/%{name}/www --enable-debug \
+	--with-log-file-perm=0600 --enable-relro \
+	--with-pdftops=pdftops \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--enable-avahi \
+	--enable-threads \
+	--enable-gnutls \
 	--disable-slp \
-	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1
+	localedir=%{_datadir}/locale
+
+	##--enable-lspp \
 
 perl -pi -e "s,^DSO	=.*,DSO=gcc -fpic," Makedefs
 
@@ -257,12 +349,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make BUILDROOT=$RPM_BUILD_ROOT install 
 
-
-# Include Till Kamppeter's dnssd backend.
-%if %use_avahi
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/%{name}/backend/dnssd
-%endif
-
 # Serial backend needs to run as root (bug #212577).
 chmod 700 $RPM_BUILD_ROOT%{_libdir}/%{name}/backend/serial
 
@@ -272,7 +358,7 @@ rm -rf	$RPM_BUILD_ROOT%{initdir} \
 mkdir -p $RPM_BUILD_ROOT%{initdir}
 install -m 755 $RPM_SOURCE_DIR/cups.init $RPM_BUILD_ROOT%{initdir}/cups
 
-find $RPM_BUILD_ROOT%{_datadir}/cups/model -name "*.ppd" |xargs gzip -9f
+find $RPM_BUILD_ROOT%{_datadir}/cups/model -name "*.ppd" |xargs gzip -n9f
 
 %if %use_alternatives
 pushd $RPM_BUILD_ROOT%{_bindir}
@@ -294,44 +380,13 @@ popd
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -c -m 644 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
-install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
-install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp
-install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
-install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
-install -c -m 755 %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/cups/filter/textonly
-install -c -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd
-
-cat >$RPM_BUILD_ROOT%{_sysconfdir}/cups/snmp.conf <<"EOF"
-#Address @LOCAL
-#Community public
-#DebugLevel 0
-#HostNameLookups off
-EOF
-
-# Ship pstoraster (bug #69573).
-install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter
-install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
-
-# Ship a generic postscript PPD file (#73061)
-install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
-
-%if %use_dbus
-# D-BUS configuration.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
-install -c -m 644 %{SOURCE208} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
-%endif
-
-# Ship a PCL XL/PCL 6 filter file from ESP gs-7.07.1
-install -c -m 644 %{SOURCE206} $RPM_BUILD_ROOT%{_datadir}/cups/model
-install -c -m 644 %{SOURCE207} $RPM_BUILD_ROOT%{_datadir}/cups/model
-
-# Ship a dvitops
-install -c -m 755 %{SOURCE201} $RPM_BUILD_ROOT%{_libdir}/cups/filter
-install -c -m 644 %{SOURCE202} $RPM_BUILD_ROOT%{_sysconfdir}/cups
-install -c -m 644 %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/cups
+install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
+install -c -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp
+install -c -m 755 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
+install -c -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/cups/filter/textonly
+install -c -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd
 
-# Ship a cjktexttops (import from mdv)
-install -c -m 755 %{SOURCE204} $RPM_BUILD_ROOT%{_libdir}/cups/filter/
+#install -c -m 644 %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
 
 # Ship a printers.conf file, and a client.conf file.  That way, they get
 # their SELinux file contexts set correctly.
@@ -343,23 +398,38 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/subscriptions.conf
 # This is %%ghost'ed, but needs to be created in %%install anyway.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/lpoptions
 
-# LSB 3.2 printer driver directories
+# LSB 3.2 printer driver directory
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ppd
-ln -s ../../ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/3-distribution
+
+# Handle https:// device URIs (bug #478677, STR #3122).
+ln -s ipp $RPM_BUILD_ROOT%{_libdir}/cups/backend/https
 
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
-%if %{?svn:1}%{!?svn:0}
-rm -f $RPM_BUILD_ROOT%{_bindir}/ppd{c,html,i,merge,po}
-rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/{command,raster}to{escpx,pclx}
-rm -f $RPM_BUILD_ROOT%{_libdir}/cups/driver/drv
-rm -rf $RPM_BUILD_ROOT%{_datadir}/cups/ppdc
-%endif
+# Install the udev rules.
+%{__mkdir_p} %{buildroot}/lib/udev/rules.d
+install -m644 %{SOURCE3} \
+	%{buildroot}/lib/udev/rules.d/70-cups-libusb.rules
+
+# Ship a PCL XL/PCL 6 filter file from ESP gs-7.07.1
+install -c -m 644 %{SOURCE206} $RPM_BUILD_ROOT%{_datadir}/cups/model
+install -c -m 644 %{SOURCE207} $RPM_BUILD_ROOT%{_datadir}/cups/model
+
+# Ship a dvitops
+install -c -m 755 %{SOURCE201} $RPM_BUILD_ROOT%{_libdir}/cups/filter
+install -c -m 644 %{SOURCE202} $RPM_BUILD_ROOT%{_sysconfdir}/cups
+install -c -m 644 %{SOURCE203} $RPM_BUILD_ROOT%{_sysconfdir}/cups
+
+# Ship a cjktexttops (import from mdv)
+install -c -m 755 %{SOURCE204} $RPM_BUILD_ROOT%{_libdir}/cups/filter/
 
-# create directories for 32bit drivers on x86_64.
+install -c -m 644 conf/mime.types $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.types
+install -c -m 644 conf/mime.convs $RPM_BUILD_ROOT%{_sysconfdir}/cups/mime.convs
+
+# create a symlink for 32bit drivers on x86_64.
 %ifarch x86_64
 mkdir -p %{buildroot}/usr/lib
 ln -sf ../%{_lib}/cups %{buildroot}/usr/lib/cups
@@ -431,6 +501,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
+/lib/udev/rules.d/70-cups-libusb.rules
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
@@ -439,42 +510,35 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf
 %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf
 %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/printers.conf
-%config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/pdftops.conf
+#%config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/pdftops.conf
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/snmp.conf
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/subscriptions.conf
 %{_sysconfdir}/cups/interfaces
 %config(noreplace) %{_sysconfdir}/cups/mime.types
 %config(noreplace) %{_sysconfdir}/cups/mime.convs
+#%config(noreplace) %{_sysconfdir}/cups/pstoraster.convs
 %config(noreplace) %{_sysconfdir}/cups/dvitops.types
 %config(noreplace) %{_sysconfdir}/cups/dvitops.convs
 %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/lpoptions
 %dir %attr(0755,root,lp) %{_sysconfdir}/cups/ppd
 %dir %attr(0700,root,lp) %{_sysconfdir}/cups/ssl
-%{_sysconfdir}/cups/pstoraster.convs
 %config(noreplace) %{_sysconfdir}/pam.d/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
 %dir %{_datadir}/%{name}/www
-%{_datadir}/%{name}/www/favicon.*
 %{_datadir}/%{name}/www/images
-%if %{?svn:1}%{!?svn:0}
-%else
-%{_datadir}/%{name}/www/de
-%{_datadir}/%{name}/www/es
-%{_datadir}/%{name}/www/et
-%{_datadir}/%{name}/www/fr
-%{_datadir}/%{name}/www/he
-%{_datadir}/%{name}/www/id
-%{_datadir}/%{name}/www/it
-%{_datadir}/%{name}/www/ja
-%{_datadir}/%{name}/www/pl
-%{_datadir}/%{name}/www/sv
-%{_datadir}/%{name}/www/zh_TW
-%endif
 %{_datadir}/%{name}/www/*.css
 %doc %{_datadir}/%{name}/www/index.html
 %doc %{_datadir}/%{name}/www/help
 %doc %{_datadir}/%{name}/www/robots.txt
+%doc %{_datadir}/%{name}/www/de/index.html
+%doc %{_datadir}/%{name}/www/es/index.html
+%doc %{_datadir}/%{name}/www/eu/index.html
+%doc %{_datadir}/%{name}/www/id/index.html
+%doc %{_datadir}/%{name}/www/it/index.html
+%doc %{_datadir}/%{name}/www/ja/index.html
+%doc %{_datadir}/%{name}/www/pl/index.html
+%doc %{_datadir}/%{name}/www/ru/index.html
 %config(noreplace) %{initdir}/cups
 %{_bindir}/cupstestppd
 %{_bindir}/cupstestdsc
@@ -486,21 +550,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/lpr.cups
 %{_bindir}/lprm.cups
 %{_bindir}/lpstat.cups
+%{_bindir}/ppd*
 %dir %{_libdir}/cups
-%dir %{_libdir}/cups/backend
-%{_libdir}/cups/backend/http
-%{_libdir}/cups/backend/ipp
-%{_libdir}/cups/backend/lpd
-%{_libdir}/cups/backend/ncp
-%{_libdir}/cups/backend/parallel
-%{_libdir}/cups/backend/scsi
-%{_libdir}/cups/backend/serial
-%{_libdir}/cups/backend/snmp
-%{_libdir}/cups/backend/socket
-%{_libdir}/cups/backend/usb
-%if %use_avahi
-%{_libdir}/cups/backend/dnssd
-%endif
+%{_libdir}/cups/backend
 %{_libdir}/cups/cgi-bin
 %dir %{_libdir}/cups/daemon
 %{_libdir}/cups/daemon/cups-polld
@@ -514,7 +566,11 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch x86_64
 /usr/lib/cups
 %endif
-%{_mandir}/man?/*
+%{_mandir}/man1/cancel*
+%{_mandir}/man1/cupstest*
+%{_mandir}/man1/lp*
+%{_mandir}/man1/ppd*
+%{_mandir}/man[578]/*
 %{_sbindir}/*
 %dir %{_datadir}/cups
 %dir %{_datadir}/cups/banners
@@ -532,17 +588,27 @@ rm -rf $RPM_BUILD_ROOT
 %dir %attr(0755,lp,sys) /var/log/cups
 %{_datadir}/pixmaps/cupsprinter.png
 %{_sysconfdir}/cron.daily/cups
-%{_sysconfdir}/dbus-1/system.d/cups.conf
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/cups.conf
+%{_datadir}/cups/drv
+%{_datadir}/cups/examples
+%dir %{_datadir}/cups/mime
+%{_datadir}/cups/mime/mime.types
+%{_datadir}/cups/mime/mime.convs
+%dir %{_datadir}/cups/ppdc
+%{_datadir}/cups/ppdc/*.defs
+%{_datadir}/cups/ppdc/*.h
+
+%files libs
+%defattr(-,root,root)
+%doc LICENSE.txt
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
 %{_bindir}/cups-config
 %{_libdir}/*.so
 %{_includedir}/cups
-
-%files libs
-%defattr(-,root,root)
-%{_libdir}/*.so.*
+%{_mandir}/man1/cups-config.1*
 
 %if %{build_compat32}
 %files -n compat32-%{name}-devel
@@ -550,11 +616,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %files -n compat32-%{name}-libs
+%doc LICENSE.txt
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 %endif
 
 %changelog
+* Tue Mar 22 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.6-1
+- new upstream release.
+- dropped old patches.
+- shipped some patches from fedora development.
+
 * Sun Jul  4 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.11-6
 - add --disable-slp option in configure