packages: cups/cups.spec - updated to 1.4.2 - branch.diff is outdated - sor...

[lisu]

Author: lisu                         Date: Tue Nov 10 10:09:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.2
- branch.diff is outdated
- sorted BRs

---- Files affected:
packages/cups:
   cups.spec (1.273 -> 1.274) 

---- Diffs:

================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.273 packages/cups/cups.spec:1.274
--- packages/cups/cups.spec:1.273	Fri Nov  6 23:33:06 2009
+++ packages/cups/cups.spec	Tue Nov 10 11:09:42 2009
@@ -14,13 +14,13 @@
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
-Version:	1.4.1
-Release:	7
+Version:	1.4.2
+Release:	1
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
 Group:		Applications/Printing
 Source0:	http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5:	587a58039c112ecb3c932e048c8a7b01
+# Source0-md5:	d95e2d588e3d36e563027a963b117b1b
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.logrotate
@@ -29,7 +29,6 @@
 Source6:	%{name}-modprobe.conf
 # svn diff http://svn.easysw.com/public/cups/tags/release-1.4.1/ http://svn.easysw.com/public/cups/branches/branch-1.4/ > cups-branch.diff
 # + drop config-scripts/cups-common.m4 change
-Patch100:	%{name}-branch.diff
 Patch0:		%{name}-config.patch
 Patch2:		%{name}-options.patch
 Patch3:		%{name}-man_pages_linking.patch
@@ -46,11 +45,11 @@
 %{?with_dnssd:BuildRequires:	avahi-compat-libdns_sd-devel}
 BuildRequires:	dbus-devel
 BuildRequires:	glibc-headers
+BuildRequires:	heimdal-devel
 %{?with_gnutls:BuildRequires:	gnutls-devel}
 %{?with_java:BuildRequires:	jar}
 %{?with_java:BuildRequires:	jdk}
 %{?with_java:BuildRequires:	jpackage-utils}
-BuildRequires:	heimdal-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpaper-devel
 BuildRequires:	libpng-devel
@@ -330,7 +329,6 @@
 
 %prep
 %setup -q
-%patch100 -p0
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -751,6 +749,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.274  2009/11/10 10:09:42  lisu
+- updated to 1.4.2
+- branch.diff is outdated
+- sorted BRs
+
 Revision 1.273  2009/11/06 22:33:06  arekm
 - rel 7; branch fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.273&r2=1.274&f=u