rpms/cups/F-12 .cvsignore, 1.47, 1.48 cups-1.1.16-system-auth.patch, 1.5, 1.6 cups.spec, 1.531, 1.532 sources, 1.51, 1.52 cups-str3332.patch, 1.1, NONE cups-str3356.patch, 1.2, NONE cups-str3380.patch, 1.1, NONE cups-str3396.patch, 1.1, NONE
Tim Waugh
twaugh at fedoraproject.org
Tue Nov 10 13:09:54 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18872
Modified Files:
.cvsignore cups-1.1.16-system-auth.patch cups.spec sources
Removed Files:
cups-str3332.patch cups-str3356.patch cups-str3380.patch
cups-str3396.patch
Log Message:
* Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-1
- 1.4.2. No longer need str3380, str3332, str3356, str3396 patches.
- Removed postscript.ppd.gz (bug #533371).
- Renumbered patches and sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore 28 Aug 2009 21:06:45 -0000 1.47
+++ .cvsignore 10 Nov 2009 13:09:53 -0000 1.48
@@ -39,3 +39,5 @@ cups-1.4b2-source.tar.bz2
cups-1.4b2-svn8404-source.tar.bz2
cups-1.4rc1-source.tar.bz2
cups-1.4.0-source.tar.bz2
+cups-1.4b2-source.tar.bz2
+cups-1.4b2-svn8404-source.tar.bz2
cups-1.1.16-system-auth.patch:
Makefile | 12 +++++++++---
cups | 3 +++
cups.password-auth | 4 ++++
3 files changed, 16 insertions(+), 3 deletions(-)
Index: cups-1.1.16-system-auth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-1.1.16-system-auth.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cups-1.1.16-system-auth.patch 16 Sep 2009 10:25:32 -0000 1.5
+++ cups-1.1.16-system-auth.patch 10 Nov 2009 13:09:53 -0000 1.6
@@ -1,18 +1,35 @@
---- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000
-+++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000
-@@ -79,10 +79,16 @@
+diff -up /dev/null cups-1.4.2/conf/cups.password-auth
+--- /dev/null 2009-11-10 09:17:06.284031490 +0000
++++ cups-1.4.2/conf/cups.password-auth 2009-11-10 11:15:42.750666738 +0000
+@@ -0,0 +1,4 @@
++#%PAM-1.0
++# Use password-auth common PAM configuration for the daemon
++auth include password-auth
++account include password-auth
+diff -up cups-1.4.2/conf/cups.system-auth cups-1.4.2/conf/cups
+diff -up /dev/null cups-1.4.2/conf/cups.system-auth
+--- /dev/null 2009-11-10 09:17:06.284031490 +0000
++++ cups-1.4.2/conf/cups.system-auth 2009-11-10 11:15:42.750666738 +0000
+@@ -0,0 +1,3 @@
++#%PAM-1.0
++auth include system-auth
++account include system-auth
+diff -up cups-1.4.2/conf/Makefile.system-auth cups-1.4.2/conf/Makefile
+--- cups-1.4.2/conf/Makefile.system-auth 2009-09-22 22:53:31.000000000 +0100
++++ cups-1.4.2/conf/Makefile 2009-11-10 11:18:44.188791989 +0000
+@@ -90,10 +90,16 @@ install-data:
done
-if test x$(PAMDIR) != x; then \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
+- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+ if test -f /etc/pam.d/password-auth; then \
-+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups ; \
++ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
+ elif test -f /etc/pam.d/system-auth; then \
-+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
++ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
else \
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
-+ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
++ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
+ else \
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
@@ -20,16 +37,3 @@
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 @@
-+#%PAM-1.0
-+auth include system-auth
-+account include system-auth
---- /dev/null 2006-03-07 09:12:30.964372750 +0000
-+++ cups-1.2svn-r5238/conf/cups.password-auth 2006-03-07 09:43:12.000000000 +0000
-@@ -0,0 +1,4 @@
-+#%PAM-1.0
-+# Use password-auth common PAM configuration for the daemon
-+auth include password-auth
-+account include password-auth
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -p -r1.531 -r1.532
--- cups.spec 10 Nov 2009 12:50:59 -0000 1.531
+++ cups.spec 10 Nov 2009 13:09:53 -0000 1.532
@@ -8,11 +8,11 @@
Summary: Common Unix Printing System
Name: cups
-Version: 1.4.1
-Release: 13%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
-Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
+Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
Source1: cups.init
Source2: cupsprinter.png
Source3: cups-libusb.rules
@@ -20,44 +20,40 @@ Source4: pstopdf
Source5: cups-lpd
Source6: pstoraster
Source7: pstoraster.convs
-Source9: cups.logrotate
-Source10: ncp.backend
-Source12: cups.cron
-Source14: textonly.filter
-Source15: textonly.ppd
+Source8: cups.logrotate
+Source9: ncp.backend
+Source10: cups.cron
+Source11: textonly.filter
+Source12: textonly.ppd
Patch1: cups-no-gzip-man.patch
Patch2: cups-1.1.16-system-auth.patch
Patch3: cups-multilib.patch
-Patch5: cups-serial.patch
-Patch6: cups-banners.patch
-Patch7: cups-serverbin-compat.patch
-Patch8: cups-no-export-ssllibs.patch
-Patch9: cups-paps.patch
-Patch10: cups-str3380.patch
-Patch11: cups-direct-usb.patch
-Patch12: cups-lpr-help.patch
-Patch13: cups-peercred.patch
-Patch14: cups-pid.patch
-Patch15: cups-page-label.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-build.patch
-Patch23: cups-res_init.patch
-Patch25: cups-filter-debug.patch
-Patch30: cups-uri-compat.patch
-Patch35: cups-cups-get-classes.patch
-Patch37: cups-avahi.patch
-Patch38: cups-str3332.patch
-Patch39: cups-str3356.patch
-Patch40: cups-str3382.patch
-Patch41: cups-str3285_v2.patch
-Patch42: cups-str3390.patch
-Patch43: cups-str3391.patch
-Patch44: cups-str3396.patch
+Patch4: cups-serial.patch
+Patch5: cups-banners.patch
+Patch6: cups-serverbin-compat.patch
+Patch7: cups-no-export-ssllibs.patch
+Patch8: cups-paps.patch
+Patch9: cups-direct-usb.patch
+Patch10: cups-lpr-help.patch
+Patch11: cups-peercred.patch
+Patch12: cups-pid.patch
+Patch13: cups-page-label.patch
+Patch14: cups-eggcups.patch
+Patch15: cups-getpass.patch
+Patch16: cups-driverd-timeout.patch
+Patch17: cups-strict-ppd-line-length.patch
+Patch18: cups-logrotate.patch
+Patch19: cups-usb-paperout.patch
+Patch20: cups-build.patch
+Patch21: cups-res_init.patch
+Patch22: cups-filter-debug.patch
+Patch23: cups-uri-compat.patch
+Patch24: cups-cups-get-classes.patch
+Patch25: cups-avahi.patch
+Patch26: cups-str3382.patch
+Patch27: cups-str3285_v2.patch
+Patch28: cups-str3390.patch
+Patch29: cups-str3391.patch
Patch100: cups-lspp.patch
Epoch: 1
@@ -189,36 +185,32 @@ module.
%patch1 -p1 -b .no-gzip-man
%patch2 -p1 -b .system-auth
%patch3 -p1 -b .multilib
-%patch5 -p1 -b .serial
-%patch6 -p1 -b .banners
-%patch7 -p1 -b .serverbin-compat
-%patch8 -p1 -b .no-export-ssllibs
-%patch9 -p1 -b .paps
-%patch10 -p1 -b .str3380
-%patch11 -p1 -b .direct-usb
-%patch12 -p1 -b .lpr-help
-%patch13 -p1 -b .peercred
-%patch14 -p1 -b .pid
-%patch15 -p1 -b .page-label
-%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 .build
-%patch23 -p1 -b .res_init
-%patch25 -p1 -b .filter-debug
-%patch30 -p1 -b .uri-compat
-%patch35 -p1 -b .cups-get-classes
-%patch37 -p1 -b .avahi
-%patch38 -p1 -b .str3332
-%patch39 -p1 -b .str3356
-%patch40 -p1 -b .str3382
-%patch41 -p1 -b .str3285_v2
-%patch42 -p1 -b .str3390
-%patch43 -p1 -b .str3391
-%patch44 -p1 -b .str3396
+%patch4 -p1 -b .serial
+%patch5 -p1 -b .banners
+%patch6 -p1 -b .serverbin-compat
+%patch7 -p1 -b .no-export-ssllibs
+%patch8 -p1 -b .paps
+%patch9 -p1 -b .direct-usb
+%patch10 -p1 -b .lpr-help
+%patch11 -p1 -b .peercred
+%patch12 -p1 -b .pid
+%patch13 -p1 -b .page-label
+%patch14 -p1 -b .eggcups
+%patch15 -p1 -b .getpass
+%patch16 -p1 -b .driverd-timeout
+%patch17 -p1 -b .strict-ppd-line-length
+%patch18 -p1 -b .logrotate
+%patch19 -p1 -b .usb-paperout
+%patch20 -p1 -b .build
+%patch21 -p1 -b .res_init
+%patch22 -p1 -b .filter-debug
+%patch23 -p1 -b .uri-compat
+%patch24 -p1 -b .cups-get-classes
+%patch25 -p1 -b .avahi
+%patch26 -p1 -b .str3382
+%patch27 -p1 -b .str3285_v2
+%patch28 -p1 -b .str3390
+%patch29 -p1 -b .str3391
%if %lspp
%patch100 -p1 -b .lspp
@@ -290,11 +282,11 @@ 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%{cups_serverbin}/backend/ncp
-install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
-install -c -m 755 %{SOURCE14} $RPM_BUILD_ROOT%{cups_serverbin}/filter/textonly
-install -c -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd
+install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
+install -c -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp
+install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
+install -c -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{cups_serverbin}/filter/textonly
+install -c -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cups/model/textonly.ppd
# Ship pstopdf for LSPP systems to deal with malicious postscript
%if %lspp
@@ -516,8 +508,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
-* Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com>
+* Tue Nov 10 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-1
+- 1.4.2. No longer need str3380, str3332, str3356, str3396 patches.
- Removed postscript.ppd.gz (bug #533371).
+- Renumbered patches and sources.
* Tue Nov 3 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-13
- Removed stale patch from STR #2831 which was causing problems with
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- sources 14 Sep 2009 17:03:49 -0000 1.51
+++ sources 10 Nov 2009 13:09:53 -0000 1.52
@@ -1,2 +1 @@
-b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
-587a58039c112ecb3c932e048c8a7b01 cups-1.4.1-source.tar.bz2
+d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2
--- cups-str3332.patch DELETED ---
--- cups-str3356.patch DELETED ---
--- cups-str3380.patch DELETED ---
--- cups-str3396.patch DELETED ---
More information about the fedora-extras-commits
mailing list