rpms/cups/devel .cvsignore, 1.46, 1.47 cups-avahi.patch, 1.5, 1.6 cups.spec, 1.512, 1.513 sources, 1.49, 1.50 cups-str3229.patch, 1.2, NONE cups-str3231.patch, 1.1, NONE cups-str3244.patch, 1.1, NONE cups-str3253.patch, 1.1, NONE cups-str3254.patch, 1.1, NONE cups-str3258.patch, 1.1, NONE cups-str3259.patch, 1.1, NONE cups-str3266.patch, 1.1, NONE cups-str3272.patch, 1.1, NONE cups-str3277.patch, 1.1, NONE

Tim Waugh twaugh at fedoraproject.org
Fri Aug 28 21:06:47 UTC 2009 

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4520

Modified Files:
	.cvsignore cups-avahi.patch cups.spec sources 
Removed Files:
	cups-str3229.patch cups-str3231.patch cups-str3244.patch 
	cups-str3253.patch cups-str3254.patch cups-str3258.patch 
	cups-str3259.patch cups-str3266.patch cups-str3272.patch 
	cups-str3277.patch 
Log Message:
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
- 1.4.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- .cvsignore	17 Jun 2009 11:30:02 -0000	1.46
+++ .cvsignore	28 Aug 2009 21:06:45 -0000	1.47
@@ -38,3 +38,4 @@ cups-1.4b1-source.tar.bz2
 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-avahi.patch:
 backend/dnssd.c              |  532 ++++++++++++++++++++++++++++++++++++-------
 config-scripts/cups-dnssd.m4 |   15 +
 config.h.in                  |    7 
 cups/http-support.c          |  177 +++++++++++++-
 4 files changed, 645 insertions(+), 86 deletions(-)

Index: cups-avahi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-avahi.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cups-avahi.patch	29 Jul 2009 13:48:33 -0000	1.5
+++ cups-avahi.patch	28 Aug 2009 21:06:46 -0000	1.6
@@ -1,6 +1,6 @@
-diff -up cups-1.4rc1/backend/dnssd.c.avahi cups-1.4rc1/backend/dnssd.c
---- cups-1.4rc1/backend/dnssd.c.avahi	2009-07-29 14:00:53.767272320 +0100
-+++ cups-1.4rc1/backend/dnssd.c	2009-07-29 14:01:36.574271697 +0100
+diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
+--- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
++++ cups-1.4.0/backend/dnssd.c	2009-08-28 21:44:27.262137662 +0100
 @@ -22,6 +22,7 @@
   *   exec_backend()          - Execute the backend that corresponds to the
   *                             resolved service name.
@@ -775,10 +775,10 @@ diff -up cups-1.4rc1/backend/dnssd.c.ava
  /*
   * 'sigterm_handler()' - Handle termination signals...
   */
-diff -up cups-1.4rc1/config.h.in.avahi cups-1.4rc1/config.h.in
---- cups-1.4rc1/config.h.in.avahi	2009-05-14 21:48:55.000000000 +0100
-+++ cups-1.4rc1/config.h.in	2009-07-29 14:01:36.575271644 +0100
-@@ -344,6 +344,13 @@
+diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
+--- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
++++ cups-1.4.0/config.h.in	2009-08-28 21:44:27.265137528 +0100
+@@ -336,6 +336,13 @@
  
  
  /*
@@ -792,9 +792,9 @@ diff -up cups-1.4rc1/config.h.in.avahi c
   * Do we have <sys/ioctl.h>?
   */
  
-diff -up cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi cups-1.4rc1/config-scripts/cups-dnssd.m4
---- cups-1.4rc1/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4rc1/config-scripts/cups-dnssd.m4	2009-07-29 14:01:36.575271644 +0100
+diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
+--- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
++++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-08-28 21:44:27.263138688 +0100
 @@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
  DNSSDLIBS=""
  DNSSD_BACKEND=""
@@ -817,10 +817,10 @@ diff -up cups-1.4rc1/config-scripts/cups
  if test x$enable_dnssd != xno; then
  	AC_CHECK_HEADER(dns_sd.h, [
  		case "$uname" in
-diff -up cups-1.4rc1/cups/http-support.c.avahi cups-1.4rc1/cups/http-support.c
---- cups-1.4rc1/cups/http-support.c.avahi	2009-04-30 23:15:05.000000000 +0100
-+++ cups-1.4rc1/cups/http-support.c	2009-07-29 14:01:36.577396783 +0100
-@@ -54,6 +54,11 @@
+diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
+--- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
++++ cups-1.4.0/cups/http-support.c	2009-08-28 21:44:27.267137550 +0100
+@@ -55,6 +55,11 @@
  #  include <dns_sd.h>
  #  include <poll.h>
  #endif /* HAVE_DNSSD */
@@ -832,7 +832,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  
  /*
-@@ -120,6 +125,24 @@ static void		resolve_callback(DNSService
+@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
  					 void *context);
  #endif /* HAVE_DNSSD */
  
@@ -857,7 +857,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  /*
   * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1348,15 +1371,26 @@ _httpResolveURI(
+@@ -1349,15 +1372,26 @@ _httpResolveURI(
  
    if (strstr(hostname, "._tcp"))
    {
@@ -886,7 +886,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
  
      if (logit)
-@@ -1394,8 +1428,13 @@ _httpResolveURI(
+@@ -1395,8 +1429,13 @@ _httpResolveURI(
      if (domain)
        *domain++ = '\0';
  
@@ -908,7 +908,7 @@ diff -up cups-1.4rc1/cups/http-support.c
      if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
      {
        localref = ref;
-@@ -1457,6 +1497,36 @@ _httpResolveURI(
+@@ -1486,6 +1526,36 @@ _httpResolveURI(
  
        DNSServiceRefDeallocate(ref);
      }
@@ -945,7 +945,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
      if (logit)
      {
-@@ -1468,13 +1538,13 @@ _httpResolveURI(
+@@ -1497,13 +1567,13 @@ _httpResolveURI(
        fputs("STATE: -connecting-to-device\n", stderr);
      }
  
@@ -961,7 +961,7 @@ diff -up cups-1.4rc1/cups/http-support.c
  
      if (logit && !uri)
        _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1679,6 +1749,105 @@ resolve_callback(
+@@ -1708,6 +1778,105 @@ resolve_callback(
  }
  #endif /* HAVE_DNSSD */
  


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- cups.spec	27 Aug 2009 20:28:47 -0000	1.512
+++ cups.spec	28 Aug 2009 21:06:46 -0000	1.513
@@ -1,7 +1,6 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
-%define pre rc1
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define lspp 1
@@ -9,11 +8,11 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4
-Release: 0.%{pre}.21%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
+Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
 Source3: cups-libusb.rules
@@ -48,21 +47,11 @@ Patch20: cups-logrotate.patch
 Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
 Patch23: cups-res_init.patch
-Patch24: cups-str3229.patch
 Patch25: cups-filter-debug.patch
-Patch26: cups-str3231.patch
-Patch27: cups-str3244.patch
-Patch28: cups-str3258.patch
-Patch29: cups-str3259.patch
 Patch30: cups-uri-compat.patch
-Patch31: cups-str3254.patch
-Patch32: cups-str3253.patch
-Patch33: cups-str3266.patch
 Patch34: cups-str3262.patch
 Patch35: cups-cups-get-classes.patch
-Patch36: cups-str3272.patch
 Patch37: cups-avahi.patch
-Patch38: cups-str3277.patch
 Patch39: cups-str3284.patch
 Patch40: cups-str3285.patch
 Patch41: cups-str3279.patch
@@ -198,7 +187,7 @@ UNIX® operating systems. This is the pa
 module. 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}%{?svn}
+%setup -q -n %{name}-%{version}
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
@@ -220,21 +209,11 @@ module. 
 %patch21 -p1 -b .usb-paperout
 %patch22 -p1 -b .build
 %patch23 -p1 -b .res_init
-%patch24 -p1 -b .str3229
 %patch25 -p1 -b .filter-debug
-%patch26 -p1 -b .str3231
-%patch27 -p1 -b .str3244
-%patch28 -p1 -b .str3258
-%patch29 -p1 -b .str3259
 %patch30 -p1 -b .uri-compat
-%patch31 -p1 -b .str3254
-%patch32 -p1 -b .str3253
-%patch33 -p1 -b .str3266
 %patch34 -p1 -b .str3262
 %patch35 -p1 -b .cups-get-classes
-%patch36 -p1 -b .str3272
 %patch37 -p1 -b .avahi
-%patch38 -p1 -b .str3277
 %patch39 -p1 -b .str3284
 %patch40 -p1 -b .str3285
 %patch41 -p1 -b .str3279
@@ -449,6 +428,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/portreserve/%{name}
 %dir %{_datadir}/%{name}/www
 %dir %{_datadir}/%{name}/www/es
+%dir %{_datadir}/%{name}/www/eu
 %dir %{_datadir}/%{name}/www/ja
 %dir %{_datadir}/%{name}/www/pl
 %dir %{_datadir}/%{name}/www/ru
@@ -459,6 +439,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %doc %{_datadir}/%{name}/www/robots.txt
 %config(noreplace) %doc %{_datadir}/%{name}/www/de/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html
+%config(noreplace) %doc %{_datadir}/%{name}/www/eu/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html
 %config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html
@@ -493,6 +474,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/cups/templates/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/de/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/es/*.tmpl
+%config(noreplace) %{_datadir}/cups/templates/eu/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl
 %config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl
@@ -538,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.0-1
+- 1.4.0.
+
 * Thu Aug 27 2009 Warren Togami <wtogami at redhat.com> 1:1.4-0.rc1.21
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	17 Jun 2009 11:30:03 -0000	1.49
+++ sources	28 Aug 2009 21:06:47 -0000	1.50
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-79948fc1a46e1a3f7aabe5a76fb99e8e  cups-1.4rc1-source.tar.bz2
+bc5e777d4320cecdd1a64de8035171a8  cups-1.4.0-source.tar.bz2


--- cups-str3229.patch DELETED ---


--- cups-str3231.patch DELETED ---


--- cups-str3244.patch DELETED ---


--- cups-str3253.patch DELETED ---


--- cups-str3254.patch DELETED ---


--- cups-str3258.patch DELETED ---


--- cups-str3259.patch DELETED ---


--- cups-str3266.patch DELETED ---


--- cups-str3272.patch DELETED ---


--- cups-str3277.patch DELETED ---

More information about the fedora-extras-commits mailing list