rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Rebuilt.

Browse Source
This commit is contained in:
Tim Waugh 2006-03-17 12:10:57 +00:00
parent 9080a93603
commit 0edf4c01cd
8 changed files with 202 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
cups-1.1.15-initscript.patch
View File

@ -1,55 +1,41 @@
--- cups-1.1.21rc2/systemv/Makefile.noinit 2004-08-11 15:10:22.000000000 +0100 --- cups-1.2svn-r5238/Makefile.noinit 2006-03-07 09:37:02.000000000 +0000
+++ cups-1.1.21rc2/systemv/Makefile 2004-08-24 12:30:31.868411346 +0100 +++ cups-1.2svn-r5238/Makefile 2006-03-07 09:42:51.000000000 +0000
@@ -77,7 +77,7 @@ @@ -1,4 +1,4 @@
$(INSTALL_BIN) lp $(BINDIR) -#
$(INSTALL_BIN) lpoptions $(BINDIR) +
$(INSTALL_BIN) lpstat $(BINDIR) # "$Id: cups-1.1.15-initscript.patch,v 1.4 2006/03/17 12:10:57 twaugh Exp $"
- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) #
+ -$(INSTALL_BIN) -m 4755 lppasswd $(BINDIR) # Top-level Makefile for the Common UNIX Printing System (CUPS).
if test ! -x $(BINDIR)/lppasswd; then \ @@ -80,32 +80,6 @@
chmod 755 $(BINDIR)/lppasswd; \
fi
--- cups-1.1.21rc2/Makefile.noinit 2004-02-25 20:14:50.000000000 +0000
+++ cups-1.1.21rc2/Makefile 2004-08-24 12:28:17.704029413 +0100
@@ -89,30 +89,6 @@
echo Installing cups-config script... echo Installing cups-config script...
$(INSTALL_DIR) $(BINDIR) $(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
- echo Installing startup script... - echo Installing startup script...
- if test "x$(INITDIR)" != "x"; then \ - if test "x$(INITDIR)" != "x"; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
- fi - fi
- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
- $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \ - $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ - $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ - $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- else \ - else \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
- fi \ - fi \
- fi - fi
if test "x$(DBUSDIR)" != "x"; then \
# echo Installing cups.conf in $(DBUSDIR)...;\
# Install source and header files... $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
--- cups-1.1.21rc2/Makedefs.in.noinit 2004-06-29 04:14:19.000000000 +0100
+++ cups-1.1.21rc2/Makedefs.in 2004-08-24 12:28:17.713027695 +0100
@@ -47,7 +47,7 @@
# Installation programs...
#
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_DIR = $(INSTALL) -d
INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755

39
cups-1.1.16-system-auth.patch
View File

@ -1,21 +1,26 @@
--- /dev/null 2004-02-23 21:02:56.000000000 +0000 --- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000
+++ cups-1.1.21rc1/conf/cups.system-auth 2004-06-03 15:14:55.795385144 +0100 +++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000
@@ -79,10 +79,14 @@
done
-if test x$(PAMDIR) != x; then \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+ if test -f /etc/pam.d/system-auth; then \
+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
else \
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
+ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+ else \
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
+ fi ; \
fi ; \
fi
--- /dev/null 2006-03-07 09:12:30.964372750 +0000
+++ cups-1.2svn-r5238/conf/cups.system-auth 2006-03-07 09:43:12.000000000 +0000
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+#%PAM-1.0 +#%PAM-1.0
+auth include system-auth +auth include system-auth
+account include system-auth +account include system-auth
--- cups-1.1.21rc1/conf/Makefile.system-auth 2004-02-26 16:51:59.000000000 +0000
+++ cups-1.1.21rc1/conf/Makefile 2004-06-03 15:32:52.108540894 +0100
@@ -67,7 +67,11 @@
done
-if test x$(PAMDIR) != x$(BUILDROOT); then \
$(INSTALL_DIR) $(PAMDIR); \
- $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
+ if test -f /etc/pam.d/system-auth; then \
+ $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \
+ else \
+ $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \
+ fi \
fi

43
cups-locale.patch
View File

@ -1,28 +1,39 @@
diff -ruN cups-1.1.19.orig/cups/language.c cups-1.1.19/cups/language.c --- cups-1.2svn-r5137/cups/language.c.locale 2006-02-15 20:11:10.000000000 +0000
--- cups-1.1.19.orig/cups/language.c 2003-08-14 20:13:18.000000000 +0900 +++ cups-1.2svn-r5137/cups/language.c 2006-02-23 14:43:59.000000000 +0000
+++ cups-1.1.19/cups/language.c 2003-08-14 20:37:37.000000000 +0900 @@ -276,6 +276,7 @@
@@ -188,6 +188,7 @@ #endif /* CODESET */
charset[16], /* Character set */ *ptr, /* Pointer into language/charset */
*ptr, /* Pointer into language/ */
real[48], /* Real language name */ real[48], /* Real language name */
+ ll_cc[48], /* Language + Country name */ + ll_cc[48], /* Language + Country name */
filename[1024], /* Filename for language locale file */ filename[1024]; /* Filename for language locale file */
*localedir; /* Directory for locale files */
cups_encoding_t encoding; /* Encoding to use */ cups_encoding_t encoding; /* Encoding to use */
@@ -356,6 +357,7 @@ cups_lang_t *lang; /* Current language... */
*/ @@ -445,8 +446,10 @@
country[0] = '\0';
snprintf(real, sizeof(real), "%s_%s", langname, country); if (language == NULL || !language[0] ||
+ strcpy(ll_cc, real); - !strcmp(language, "POSIX"))
+ !strcmp(language, "POSIX")) {
strcpy(langname, "C");
+ strcpy(ll_cc, langname);
+ }
else
{
/*
@@ -476,6 +479,7 @@
*ptr = '\0';
}
if ((lang = cups_cache_lookup(real, encoding)) != NULL) + snprintf(ll_cc, sizeof(ll_cc), "%s_%s", langname, country);
return (lang); if (*language == '.' && !charset[0])
@@ -468,7 +470,7 @@ {
/*
@@ -617,7 +621,7 @@
*/ */
lang->used ++; lang->used ++;
- strlcpy(lang->language, real, sizeof(lang->language)); - strlcpy(lang->language, real, sizeof(lang->language));
+ strlcpy(lang->language, ll_cc, sizeof(lang->language)); + strlcpy(lang->language, ll_cc, sizeof(lang->language));
if (charset[0]) if (encoding != CUPS_AUTO_ENCODING)
lang->encoding = encoding; lang->encoding = encoding;

2
cups-lpd
View File

@ -7,5 +7,5 @@ service printer
protocol = tcp protocol = tcp
wait = no wait = no
user = lp user = lp
server = @LIBDIR@/cups/daemon/cups-lpd server = /usr/lib/cups/daemon/cups-lpd
} }

17
cups-no-gzip-man.patch Normal file
View File

@ -0,0 +1,17 @@
--- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man 2006-02-13 02:46:10.000000000 +0000
+++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4 2006-02-17 09:55:45.000000000 +0000
@@ -80,10 +80,10 @@
;;
Linux* | GNU*)
# Linux and GNU Hurd
- MAN1EXT=1.gz
- MAN5EXT=5.gz
- MAN7EXT=7.gz
- MAN8EXT=8.gz
+ MAN1EXT=1
+ MAN5EXT=5
+ MAN7EXT=7
+ MAN8EXT=8
MAN8DIR=8
;;
*)

4
cups-relro.patch
View File

@ -1,5 +1,5 @@
--- cups-1.1.23/pdftops/Makefile.relro 2005-12-19 16:48:14.000000000 +0000 --- cups-1.2svn-r4964/pdftops/Makefile.relro 2006-01-25 16:56:03.000000000 +0000
+++ cups-1.1.23/pdftops/Makefile 2005-12-19 16:50:49.000000000 +0000 +++ cups-1.2svn-r4964/pdftops/Makefile 2006-01-25 16:56:40.000000000 +0000
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@

223
cups.spec
View File

@ -1,15 +1,16 @@
%define initdir /etc/rc.d/init.d %define initdir /etc/rc.d/init.d
%define use_alternatives 1 %define use_alternatives 1
%define use_dbus 1
%define build_as_pie 1 %define build_as_pie 1
%define beta b2
%define cups_serverbin %{_exec_prefix}/lib/cups
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.1.23 Version: 1.2
Release: 30.2 Release: 0.1.%{beta}.2
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
Source1: cups.init Source1: cups.init
Source2: cupsprinter.png Source2: cupsprinter.png
Source5: cups-lpd Source5: cups-lpd
@ -21,44 +22,26 @@ Source10: ncp.backend
Source11: cups.conf Source11: cups.conf
Source12: cups.cron Source12: cups.cron
Patch0: cups-1.1.15-initscript.patch Patch0: cups-1.1.15-initscript.patch
Patch1: cups-1.1.14-doclink.patch Patch1: cups-no-gzip-man.patch
Patch2: cups-1.1.16-system-auth.patch Patch2: cups-1.1.16-system-auth.patch
Patch3: cups-1.1.17-backend.patch Patch3: cups-1.1.17-backend.patch
Patch4: cups-ext.patch Patch4: cups-ext.patch
Patch5: cups-str1023.patch Patch5: cups-policy.patch
Patch6: cups-1.1.17-pdftops.patch Patch6: cups-users.patch
Patch7: cups-logfileperm.patch Patch7: cups-logfileperm.patch
Patch8: cups-1.1.17-rcp.patch Patch8: cups-1.1.17-rcp.patch
Patch9: cups-1.1.17-ppdsdat.patch Patch9: cups-1.1.17-ppdsdat.patch
Patch10: cups-1.1.17-sanity.patch
Patch11: cups-1.1.19-lpstat.patch
Patch12: cups-locale.patch Patch12: cups-locale.patch
Patch13: cups-CAN-2005-0064.patch Patch13: cups-CAN-2005-0064.patch
Patch14: cups-str1068.patch
Patch15: cups-sigchld.patch
Patch16: cups-pie.patch Patch16: cups-pie.patch
Patch17: cups-1.1.19-no_rpath.patch Patch17: cups-1.1.19-no_rpath.patch
Patch18: cups-language.patch Patch18: cups-language.patch
Patch19: cups-gcc34.patch
Patch20: cups-gcc4.patch
Patch21: cups-slow.patch
Patch22: cups-dest-cache-v2.patch Patch22: cups-dest-cache-v2.patch
Patch23: cups-autodetected-tag.patch
Patch24: cups-maxlogsize.patch Patch24: cups-maxlogsize.patch
Patch25: cups-enabledisable.patch
Patch28: cups-no-propagate-ipp-port.patch Patch28: cups-no-propagate-ipp-port.patch
Patch32: cups-pid.patch Patch32: cups-pid.patch
Patch33: cups-CAN-2004-0888.patch
Patch34: cups-CAN-2005-2097.patch
Patch35: cups-finddest.patch
Patch36: cups-str1249.patch
Patch37: cups-str1284.patch
Patch38: cups-str1290.patch
Patch39: cups-str1301.patch
Patch40: cups-link.patch Patch40: cups-link.patch
Patch41: cups-relro.patch Patch41: cups-relro.patch
Patch42: cups-CVE-2005-3625,6,7.patch
Patch43: cups-dbus.patch
Epoch: 1 Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -74,15 +57,15 @@ Obsoletes: lpd lpr LPRng <= 3.8.15-3
Provides: lpd lpr LPRng = 3.8.15-3 Provides: lpd lpr LPRng = 3.8.15-3
BuildPrereq: pam-devel openssl-devel pkgconfig BuildPrereq: pam-devel openssl-devel pkgconfig
BuildPrereq: gnutls-devel
BuildRequires: make >= 1:3.80 BuildRequires: make >= 1:3.80
BuildRequires: php-devel, aspell-devel, pcre-devel
# -fstack-protector-all requires GCC 4.0.1 # -fstack-protector-all requires GCC 4.0.1
BuildRequires: gcc >= 4.0.1 BuildRequires: gcc >= 4.0.1
%if %use_dbus
BuildPrereq: dbus-devel >= 0.60 BuildPrereq: dbus-devel >= 0.60
Requires: dbus >= 0.60 Requires: dbus >= 0.60
%endif
%package devel %package devel
Summary: Common Unix Printing System - development environment Summary: Common Unix Printing System - development environment
@ -124,50 +107,30 @@ UNIX® operating systems. This is the package that provices standard
lpd emulation. lpd emulation.
%prep %prep
%setup -q %setup -q -n %{name}-%{version}%{beta}
%patch0 -p1 -b .noinit %patch0 -p1 -b .noinit
%patch1 -p1 -b .doclink %patch1 -p1 -b .no-gzip-man
%patch2 -p1 -b .system-auth %patch2 -p1 -b .system-auth
%patch3 -p1 -b .backend %patch3 -p1 -b .backend
%patch4 -p1 -b .ext %patch4 -p1 -b .ext
%patch5 -p1 -b .str1023 %patch5 -p1 -b .policy
%patch6 -p1 -b .pdftops %patch6 -p1 -b .users
%patch7 -p1 -b .logfileperm %patch7 -p1 -b .logfileperm
%patch8 -p1 -b .rcp %patch8 -p1 -b .rcp
%patch9 -p1 -b .ppdsdat %patch9 -p1 -b .ppdsdat
%patch10 -p1 -b .sanity
%patch11 -p1 -b .lpstat
%patch12 -p1 -b .locale %patch12 -p1 -b .locale
%patch13 -p1 -b .CAN-2005-0064 %patch13 -p1 -b .CAN-2005-0064
%patch14 -p1 -b .str1068
%patch15 -p1 -b .sigchld
%if %build_as_pie %if %build_as_pie
%patch16 -p1 -b .pie %patch16 -p1 -b .pie
%endif %endif
%patch17 -p1 -b .no_rpath %patch17 -p1 -b .no_rpath
%patch18 -p1 -b .language %patch18 -p1 -b .language
%patch19 -p1 -b .gcc34
%patch20 -p1 -b .gcc4
%patch21 -p1 -b .slow
%patch22 -p1 -b .dest-cache-v2 %patch22 -p1 -b .dest-cache-v2
%patch23 -p1 -b .autodetected-tag
%patch24 -p1 -b .maxlogsize %patch24 -p1 -b .maxlogsize
%patch25 -p1 -b .enabledisable
%patch28 -p1 -b .no-propagate-ipp-port %patch28 -p1 -b .no-propagate-ipp-port
%patch32 -p1 -b .pid %patch32 -p1 -b .pid
%patch33 -p1 -b .CAN-2004-0888
%patch34 -p1 -b .CAN-2005-2097
%patch35 -p1 -b .finddest
%patch36 -p1 -b .str1249
%patch37 -p1 -b .str1284
%patch38 -p1 -b .str1290
%patch39 -p1 -b .str1301
%patch40 -p1 -b .link %patch40 -p1 -b .link
%patch41 -p1 -b .relro %patch41 -p1 -b .relro
%patch42 -p1 -b .CVE-2005-3625,6,7
%if %use_dbus
%patch43 -p1 -b .dbus
%endif
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
aclocal -I config-scripts aclocal -I config-scripts
autoconf autoconf
@ -178,11 +141,6 @@ perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
# Let's look at the compilation command lines. # Let's look at the compilation command lines.
perl -pi -e "s,^.SILENT:,," Makedefs.in perl -pi -e "s,^.SILENT:,," Makedefs.in
for i in man/{es,fr}/*.man templates/{de,fr}/*.tmpl; do
iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
mv "${i}_" "$i"
done
%build %build
if pkg-config openssl ; then if pkg-config openssl ; then
export CFLAGS=`pkg-config --cflags openssl` export CFLAGS=`pkg-config --cflags openssl`
@ -227,7 +185,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sy
install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps 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 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 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 %{SOURCE10} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp
install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
# Deal with users trying to access the admin tool at # Deal with users trying to access the admin tool at
@ -256,29 +214,21 @@ EOF
done done
# Ship pstoraster (bug #69573). # Ship pstoraster (bug #69573).
install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter
install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups
# Ship a generic postscript PPD file (#73061) # Ship a generic postscript PPD file (#73061)
install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model
%if %use_dbus # Ship a clients.conf file.
# D-BUS configuration. touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf # Ship an SSL directory
%endif mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
# Remove unshipped files. # Remove unshipped files.
rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
# Remove .pdf from docs, fix links
for pdf in cmp.pdf ipp.pdf sam.pdf spm.pdf ssr.pdf sum.pdf translation.pdf \
idd.pdf overview.pdf sdd.pdf sps.pdf stp.pdf svd.pdf
do
perl -p -i -e "s@$pdf@http://www.cups.org/$pdf@" $RPM_BUILD_ROOT%{_docdir}/cups-%{version}/documentation.html
done
find $RPM_BUILD_ROOT%{_docdir}/cups-%{version} -name *.pdf |xargs rm
%post %post
/sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
@ -327,90 +277,78 @@ fi
exit 0 exit 0
%triggerin -- samba-client %triggerin -- samba-client
ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || :
exit 0 exit 0
%triggerun -- samba-client %triggerun -- samba-client
[ $2 = 0 ] || exit 0 [ $2 = 0 ] || exit 0
rm -f %{_libdir}/cups/backend/smb rm -f %{cups_serverbin}/backend/smb
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%dir %attr(0775,root,sys) /etc/cups %dir %attr(0755,root,nobody) /etc/cups
%dir %attr(0711,root,sys) /etc/cups/certs %dir %attr(0511,lp,sys) /var/run/cups/certs
%config(noreplace) %attr(0640,root,sys) /etc/cups/classes.conf %config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf
%config(noreplace) %attr(0640,root,sys) /etc/cups/cupsd.conf %attr(0640,root,nobody) /etc/cups/cupsd.conf.default
%config(noreplace) %attr(0640,root,sys) /etc/cups/printers.conf %config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf
%config(noreplace) /etc/cups/client.conf
/etc/cups/interfaces /etc/cups/interfaces
%config(noreplace) /etc/cups/mime.types %config(noreplace) /etc/cups/mime.types
%config(noreplace) /etc/cups/mime.convs %config(noreplace) /etc/cups/mime.convs
%dir %attr(0755,root,sys) /etc/cups/ppd %dir %attr(0755,root,nobody) /etc/cups/ppd
%dir %attr(0700,root,nobody) /etc/cups/ssl
/etc/cups/pstoraster.convs /etc/cups/pstoraster.convs
%config(noreplace) /etc/pam.d/cups %config(noreplace) /etc/pam.d/cups
%dir %{_docdir}/cups-%{version} %dir %{_docdir}/cups-%{version}
%{_docdir}/cups-%{version}/favicon.ico
%{_docdir}/cups-%{version}/images %{_docdir}/cups-%{version}/images
%{_docdir}/cups-%{version}/ja
%{_docdir}/cups-%{version}/*.css %{_docdir}/cups-%{version}/*.css
%{_docdir}/cups-%{version}/documentation.html
%{_docdir}/cups-%{version}/??
%{_docdir}/cups-%{version}/admin %{_docdir}/cups-%{version}/admin
%{_docdir}/cups-%{version}/classes %{_docdir}/cups-%{version}/classes
%{_docdir}/cups-%{version}/jobs %{_docdir}/cups-%{version}/jobs
%{_docdir}/cups-%{version}/printers %{_docdir}/cups-%{version}/printers
%doc %{_docdir}/cups-%{version}/index.html %doc %{_docdir}/cups-%{version}/index.html
%doc %{_docdir}/cups-%{version}/cmp.html %doc %{_docdir}/cups-%{version}/help
%doc %{_docdir}/cups-%{version}/idd.html
%doc %{_docdir}/cups-%{version}/ipp.html
%doc %{_docdir}/cups-%{version}/overview.html
%doc %{_docdir}/cups-%{version}/sam.html
%doc %{_docdir}/cups-%{version}/sdd.html
%doc %{_docdir}/cups-%{version}/spm.html
%doc %{_docdir}/cups-%{version}/sps.html
%doc %{_docdir}/cups-%{version}/ssr.html
%doc %{_docdir}/cups-%{version}/stp.html
%doc %{_docdir}/cups-%{version}/sum.html
%doc %{_docdir}/cups-%{version}/svd.html
%doc %{_docdir}/cups-%{version}/translation.html
%doc %{_docdir}/cups-%{version}/robots.txt %doc %{_docdir}/cups-%{version}/robots.txt
%config(noreplace) %{initdir}/cups %config(noreplace) %{initdir}/cups
%{_bindir}/cupstestppd %{_bindir}/cupstestppd
%{_bindir}/cancel* %{_bindir}/cancel*
%{_bindir}/enable*
%{_bindir}/disable*
%{_bindir}/cupsenable*
%{_bindir}/cupsdisable*
%{_bindir}/lp* %{_bindir}/lp*
%dir %{_libdir}/cups %dir %{cups_serverbin}
%{_libdir}/cups/backend %{cups_serverbin}/backend
%{_libdir}/cups/cgi-bin %{cups_serverbin}/cgi-bin
%dir %{_libdir}/cups/daemon %dir %{cups_serverbin}/daemon
%{_libdir}/cups/daemon/cups-polld %{cups_serverbin}/daemon/cups-polld
%{_libdir}/cups/filter %{cups_serverbin}/daemon/cups-deviced
%{cups_serverbin}/daemon/cups-driverd
%{cups_serverbin}/notifier/mailto
%{cups_serverbin}/notifier/testnotify
%{cups_serverbin}/filter
%{cups_serverbin}/monitor
%{_mandir}/man?/* %{_mandir}/man?/*
%{_mandir}/*/man?/*
%{_sbindir}/* %{_sbindir}/*
%dir %{_datadir}/cups %dir %{_datadir}/cups
%dir %{_datadir}/cups/banners %dir %{_datadir}/cups/banners
%config(noreplace) %{_datadir}/cups/banners/* %config(noreplace) %{_datadir}/cups/banners/*
%{_datadir}/cups/charsets %{_datadir}/cups/charsets
%{_datadir}/cups/charmaps
%{_datadir}/cups/data %{_datadir}/cups/data
%{_datadir}/cups/doc %{_datadir}/cups/doc
%{_datadir}/cups/fonts %{_datadir}/cups/fonts
%{_datadir}/cups/model %{_datadir}/cups/model
%{_datadir}/cups/templates %{_datadir}/cups/templates
%{_datadir}/locale/*/* %{_datadir}/locale/*/*
%dir %attr(1770,root,sys) /var/spool/cups/tmp %dir %attr(1770,root,nobody) /var/spool/cups/tmp
%dir %attr(0710,root,sys) /var/spool/cups %dir %attr(0710,root,nobody) /var/spool/cups
%dir %attr(0755,lp,sys) /var/log/cups %dir %attr(0755,lp,sys) /var/log/cups
%config(noreplace) %{_sysconfdir}/logrotate.d/cups %config(noreplace) %{_sysconfdir}/logrotate.d/cups
%{_datadir}/pixmaps/cupsprinter.png %{_datadir}/pixmaps/cupsprinter.png
%{_sysconfdir}/cron.daily/cups %{_sysconfdir}/cron.daily/cups
%if %use_dbus
%{_sysconfdir}/dbus-1/system.d/cups.conf %{_sysconfdir}/dbus-1/system.d/cups.conf
%endif %{_libdir}/php/modules/*.so
%files libs %files libs
%defattr(-,root,root) %defattr(-,root,root)
@ -420,28 +358,71 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/cups-config %{_bindir}/cups-config
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/*.a
%{_includedir}/cups %{_includedir}/cups
%files lpd %files lpd
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd %config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd
%dir %{_libdir}/cups %dir %{cups_serverbin}
%dir %{_libdir}/cups/daemon %dir %{cups_serverbin}/daemon
%{_libdir}/cups/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Mon Feb 13 2006 Tim Waugh <twaugh@redhat.com> * Fri Mar 17 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.1.b2.2
- Rebuilt.
* Tue Mar 14 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.1.b2.1
- Build requires gnutls-devel.
- Fixed default policy name.
- Fixed 'set-allowed-users' in web UI.
* Mon Mar 13 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.1.b2.0
- 1.2b2.
- Use new CUPS_SERVERBIN location (/usr/lib/cups even on 64-bit hosts).
* Fri Mar 10 2006 Tim Waugh <twaugh@redhat.com>
- Fixed some permissions.
* Fri Mar 10 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.1.b1.1
- Ship /etc/cups/ssl directory.
* Thu Mar 9 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.1.b1.0
- 1.2b1. No longer need devid patch.
* Wed Mar 8 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn5238.2
- Fixed 'device-id' attribute in GET_DEVICES requests (STR #1467).
* Tue Mar 7 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn5238.1
- New svn snapshot.
- No longer need browse or raw patches.
* Wed Mar 1 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn5137.1
- Fixed raw printing.
- Removed (unapplied) session printing patch. - Removed (unapplied) session printing patch.
- Fixed browse info.
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:1.1.23-30.2 * Thu Feb 23 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn5137.0
- bump again for double-long bug on ppc(64) - New svn snapshot.
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:1.1.23-30.1 * Fri Feb 17 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn5102.0
- rebuilt for new gcc4.1 snapshot and glibc changes - New svn snapshot.
- No longer need enabledisable patch.
- Fixed double-free in scheduler/policy.c (STR #1428).
* Wed Jan 25 2006 Tim Waugh <twaugh@redhat.com> * Fri Feb 10 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn5083.0
- Fixed link patch. - New svn snapshot.
* Wed Jan 25 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.0.svn4964.0
- Use -fPIE not -fpie in PIE patch.
- Fix link patch.
- Patch in PIE instead of using --enable-pie, since that doesn't work.
* Fri Jan 20 2006 Tim Waugh <twaugh@redhat.com>
- 1.2 svn snapshot.
- No longer need doclink, str1023, pdftops, sanity, lpstat, str1068,
sigchld, gcc34, gcc4, slow, CAN-2004-0888, CAN-2005-2097, finddest,
str1249, str1284, str1290, str1301, CVE-2005-3625,6,7 patches.
- Removed autodetect-tag patch.
* Tue Jan 17 2006 Tim Waugh <twaugh@redhat.com> 1:1.1.23-30 * Tue Jan 17 2006 Tim Waugh <twaugh@redhat.com> 1:1.1.23-30
- Include 'Autodetected' tag for better integration with autodetection tools. - Include 'Autodetected' tag for better integration with autodetection tools.

2
sources
View File

@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 67a912af67de02e290a149f3947da96d cups-1.2b2-source.tar.bz2