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

- Sync to svn5555. No longer need str1670 or str1705 patches.

Browse Source
This commit is contained in:
Tim Waugh 2006-05-20 16:35:12 +00:00
parent 8bfdfeb9db
commit 579b4523fa
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups-1.1.15-initscript.patch
View File

@ -1,11 +1,11 @@
--- cups-1.2b2/Makefile.noinit 2006-03-23 11:39:33.000000000 +0000 --- cups-1.2.0/Makefile.noinit 2006-05-20 17:21:22.000000000 +0100
+++ cups-1.2b2/Makefile 2006-03-23 11:40:22.000000000 +0000 +++ cups-1.2.0/Makefile 2006-05-20 17:27:01.000000000 +0100
@@ -80,32 +80,6 @@ @@ -99,35 +99,6 @@
echo Installing cups-config script... echo Installing cups-config script...
$(INSTALL_DIR) -m 755 $(BINDIR) $(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
- echo Installing startup script...
- if test "x$(INITDIR)" != x; then \ - if test "x$(INITDIR)" != x; then \
- echo Installing init scripts...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@ -20,13 +20,16 @@
- 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 \
- echo Installing StartupItems files...; \
- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ - $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ - $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
- $(INSTALL_DATA) init/Localizable.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 \ - elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
- echo Installing LaunchDaemons configuration file...; \
- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ - $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- else \ - else \
- echo Installing RC script...; \
- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
- fi \ - fi \
- fi - fi

7
cups.spec
View File

@ -35,8 +35,6 @@ Patch22: cups-dest-cache-v2.patch
Patch24: cups-maxlogsize.patch Patch24: cups-maxlogsize.patch
Patch32: cups-pid.patch Patch32: cups-pid.patch
Patch41: cups-relro.patch Patch41: cups-relro.patch
Patch42: cups-str1670.patch
Patch43: cups-str1705.patch
Epoch: 1 Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -122,8 +120,6 @@ lpd emulation.
%patch24 -p1 -b .maxlogsize %patch24 -p1 -b .maxlogsize
%patch32 -p1 -b .pid %patch32 -p1 -b .pid
%patch41 -p1 -b .relro %patch41 -p1 -b .relro
%patch42 -p1 -b .str1670
%patch43 -p1 -b .str1705
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
@ -379,6 +375,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Sat May 20 2006 Tim Waugh <twaugh@redhat.com>
- Sync to svn5555. No longer need str1670 or str1705 patches.
* Fri May 19 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-5 * Fri May 19 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-5
- Sync to svn5545. - Sync to svn5545.
- Ship a driver directory. - Ship a driver directory.