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

- 1.2.3. No longer need str1880 or str1881 patches.

Browse Source
This commit is contained in:
Tim Waugh 2006-08-30 15:01:38 +00:00
parent 00838e41cf
commit adb38bb02a
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -12,3 +12,4 @@ cups-1.2rc3-source.tar.bz2
cups-1.2.0-source.tar.bz2 cups-1.2.0-source.tar.bz2
cups-1.2.1-source.tar.bz2 cups-1.2.1-source.tar.bz2
cups-1.2.2-source.tar.bz2 cups-1.2.2-source.tar.bz2
cups-1.2.3-source.tar.bz2

9
cups-1.1.15-initscript.patch
View File

@ -1,6 +1,6 @@
--- cups-1.2.0/Makefile.noinit 2006-05-20 17:21:22.000000000 +0100 --- cups-1.2.3/Makefile.noinit 2006-08-29 16:51:19.000000000 +0100
+++ cups-1.2.0/Makefile 2006-05-20 17:27:01.000000000 +0100 +++ cups-1.2.3/Makefile 2006-08-30 15:46:36.000000000 +0100
@@ -99,35 +99,6 @@ @@ -99,36 +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
@ -26,8 +26,9 @@
- $(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...; \ - echo Installing LaunchDaemons configuration files...; \
- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ - $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
- $(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
- else \ - else \
- echo Installing RC script...; \ - echo Installing RC script...; \
- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \

6
cups-multilib.patch
View File

@ -1,5 +1,5 @@
--- cups-1.2.0/cups-config.in.multilib 2006-05-22 19:05:17.000000000 +0100 --- cups-1.2.3/cups-config.in.multilib 2006-08-03 01:54:38.000000000 +0100
+++ cups-1.2.0/cups-config.in 2006-05-22 19:06:07.000000000 +0100 +++ cups-1.2.3/cups-config.in 2006-08-30 15:47:35.000000000 +0100
@@ -30,8 +30,10 @@ @@ -30,8 +30,10 @@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
@ -10,6 +10,6 @@
+# of a cheat, but the cups-devel package requires gnutls-devel anyway. +# of a cheat, but the cups-devel package requires gnutls-devel anyway.
+libdir=`pkg-config --variable=libdir gnutls` +libdir=`pkg-config --variable=libdir gnutls`
+imagelibdir=`pkg-config --variable=libdir gnutls` +imagelibdir=`pkg-config --variable=libdir gnutls`
datarootdir=@datadir@
datadir=@datadir@ datadir=@datadir@
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
cups_datadir=@CUPS_DATADIR@

13
cups.spec
View File

@ -5,8 +5,8 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.2.2 Version: 1.2.3
Release: 17 Release: 2
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -39,9 +39,7 @@ Patch13: cups-direct-usb.patch
Patch15: cups-maxlogsize.patch Patch15: cups-maxlogsize.patch
Patch16: cups-pid.patch Patch16: cups-pid.patch
Patch17: cups-relro.patch Patch17: cups-relro.patch
Patch18: cups-str1881.patch
Patch19: cups-str1893.patch Patch19: cups-str1893.patch
Patch20: cups-str1880.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
Epoch: 1 Epoch: 1
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -140,9 +138,7 @@ lpd emulation.
%patch15 -p1 -b .maxlogsize %patch15 -p1 -b .maxlogsize
%patch16 -p1 -b .pid %patch16 -p1 -b .pid
%patch17 -p1 -b .relro %patch17 -p1 -b .relro
%patch18 -p1 -b .str1881
%patch19 -p1 -b .str1893 %patch19 -p1 -b .str1893
%patch20 -p1 -b .str1880
%if %lspp %if %lspp
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -418,7 +414,10 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Thu Aug 29 2006 Tim Waugh <twaugh@redhat.com> * Wed Aug 30 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.3-2
- 1.2.3. No longer need str1880 or str1881 patches.
* Tue Aug 29 2006 Tim Waugh <twaugh@redhat.com>
- Removed dest-cache patch. - Removed dest-cache patch.
* Thu Aug 24 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-17 * Thu Aug 24 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-17

2
sources
View File

@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
091de9109c9252cb37427859e90190ad cups-1.2.2-source.tar.bz2 7f65bae0054cd8335824942595d867ef cups-1.2.3-source.tar.bz2