SPECS: cups.spec - added java-fix patch - clarified License

[qboosh]

Author: qboosh                       Date: Sat Mar  1 15:35:48 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added java-fix patch
- clarified License

---- Files affected:
SPECS:
   cups.spec (1.231 -> 1.232) 

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.231 SPECS/cups.spec:1.232
--- SPECS/cups.spec:1.231	Thu Feb 28 23:18:53 2008
+++ SPECS/cups.spec	Sat Mar  1 16:35:42 2008
@@ -24,7 +24,7 @@
 Version:	1.3.6
 Release:	1
 Epoch:		1
-License:	GPL/LGPL
+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:	642f9f6d879999bff1b51aeee57a3ce1
@@ -43,6 +43,7 @@
 Patch7:		%{name}-direct_usb.patch
 Patch8:		%{name}-satisfy-any.patch
 Patch9:		%{name}-no-polluted-krb5config.patch
+Patch10:	%{name}-java-fix.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -110,6 +111,7 @@
 Summary:	Common Unix Printing System Libraries
 Summary(pl.UTF-8):	Biblioteki dla CUPS
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão - bibliotecas para uso em clientes cups
+License:	LGPL v2 + openssl exception
 Group:		Libraries
 Provides:	%{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:	cups-libs
@@ -127,6 +129,7 @@
 %package clients
 Summary:	Common Unix Printing System Clients
 Summary(pl.UTF-8):	Aplikacje klienckie dla CUPS
+License:	GPL v2 + openssl exception
 Group:		Applications/Printing
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Provides:	printingclient
@@ -142,6 +145,7 @@
 Summary:	Common Unix Printing System Libraries - images manipulation
 Summary(pl.UTF-8):	Biblioteki dla CUPS - obsługa formatów graficznych
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão - bibliotecas para uso em clientes cups
+License:	LGPL v2 + openssl exception
 Group:		Libraries
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 Obsoletes:	libcups1
@@ -159,6 +163,7 @@
 Summary:	Common Unix Printing System development files
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa - pliki nagłówkowe
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão - ambiente de desenvolvimento
+License:	LGPL v2 + openssl exception
 Group:		Development/Libraries
 Requires:	%{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
@@ -188,6 +193,7 @@
 Summary:	Common Unix Printing System static libraries
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa - biblioteki statyczne
 Summary(pt_BR.UTF-8):	Common Unix Printing System - bibliotecas estáticas
+License:	LGPL v2 + openssl exception
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
@@ -204,6 +210,7 @@
 %package -n perl-cups
 Summary:	Perl module for CUPS
 Summary(pl.UTF-8):	Moduł Perla CUPS
+License:	GPL v2 + openssl exception
 Group:		Development/Languages/Perl
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 
@@ -216,6 +223,7 @@
 %package -n php-cups
 Summary:	PHP module for CUPS
 Summary(pl.UTF-8):	Moduł PHP CUPS
+License:	GPL v2 + openssl exception
 Group:		Development/Languages/PHP
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
 %{?requires_php_extension}
@@ -231,6 +239,7 @@
 %package -n java-cups
 Summary:	CUPS java classes
 Summary(pl.UTF-8):	Klasy javy CUPS
+License:	GPL v2 + openssl exception
 Group:		Development/Languages/Java
 Requires:	jpackage-utils
 
@@ -243,6 +252,7 @@
 %package -n java-cups-javadoc
 Summary:	Online manual for %{name}
 Summary(pl.UTF-8):	Dokumentacja online do %{name}
+License:	GPL v2 + openssl exception
 Group:		Documentation
 Requires:	jpackage-utils
 
@@ -258,6 +268,7 @@
 %package backend-usb
 Summary:	USB backend for CUPS
 Summary(pl.UTF-8):	Backend USB dla CUPS-a
+License:	GPL v2 + openssl exception
 Group:		Applications/Printing
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -270,6 +281,7 @@
 %package backend-serial
 Summary:	Serial port backend for CUPS
 Summary(pl.UTF-8):	Backend obsługujący porty szeregowe dla CUPS-a
+License:	GPL v2 + openssl exception
 Group:		Applications/Printing
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -284,6 +296,7 @@
 %package backend-parallel
 Summary:	Parallel port backend for CUPS
 Summary(pl.UTF-8):	Backend obsługujący porty równoległe dla CUPS-a
+License:	GPL v2 + openssl exception
 Group:		Applications/Printing
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -298,6 +311,7 @@
 %package lpd
 Summary:	LPD compatibility support for CUPS print server
 Summary(pl.UTF-8):	Wsparcie dla LPD w serwerze wydruków CUPS
+License:	GPL v2 + openssl exception
 Group:		Applications/Printing
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	rc-inetd
@@ -320,6 +334,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -759,6 +774,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.232  2008-03-01 15:35:42  qboosh
+- added java-fix patch
+- clarified License
+
 Revision 1.231  2008-02-28 22:18:53  arekm
 - up to 1.3.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cups.spec?r1=1.231&r2=1.232&f=u