packages: cups/cups.spec, cups/cups-java-fix.patch (REMOVED) - java is no m...

[qboosh]

Author: qboosh                       Date: Thu Aug 19 07:27:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- java is no more - killed remnants

---- Files affected:
packages/cups:
   cups.spec (1.292 -> 1.293) , cups-java-fix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.292 packages/cups/cups.spec:1.293
--- packages/cups/cups.spec:1.292	Wed Jul 28 09:06:52 2010
+++ packages/cups/cups.spec	Thu Aug 19 09:27:50 2010
@@ -52,9 +52,6 @@
 BuildRequires:	glibc-headers
 %{?with_gnutls:BuildRequires:	gnutls-devel}
 %{?with_gssapi:BuildRequires:	heimdal-devel}
-%{?with_java:BuildRequires:	jar}
-%{?with_java:BuildRequires:	jdk}
-%{?with_java:BuildRequires:	jpackage-utils}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpaper-devel
 BuildRequires:	libpng-devel
@@ -68,7 +65,6 @@
 BuildRequires:	pam-devel
 %{?with_php:BuildRequires:	php-devel >= 4:5.0.0}
 BuildRequires:	pkgconfig
-%{?with_java:BuildRequires:	rpm-javaprov}
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.344
 Requires(post,preun):	/sbin/chkconfig
@@ -243,35 +239,6 @@
 %description -n php-cups -l pl.UTF-8
 Moduł PHP do ogólnego systemu druku dla Uniksa.
 
-%package -n java-cups
-Summary:	CUPS java classes
-Summary(pl.UTF-8):	Klasy javy CUPS
-License:	GPL v2 + openssl exception
-Group:		Libraries/Java
-Requires:	jpackage-utils
-
-%description -n java-cups
-Common Unix Printing System Java classes.
-
-%description -n java-cups -l pl.UTF-8
-Klasy javy do ogólnego systemu druku dla Uniksa.
-
-%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
-
-%description -n java-cups-javadoc
-Documentation for %{name}.
-
-%description -n java-cups-javadoc -l pl.UTF-8
-Dokumentacja do %{name}.
-
-%description -n java-cups-javadoc -l fr.UTF-8
-Javadoc pour %{name}.
-
 %package backend-usb
 Summary:	USB backend for CUPS
 Summary(pl.UTF-8):	Backend USB dla CUPS-a
@@ -377,7 +344,6 @@
 	--with-optim=-Wno-format-y2k \
 	%{?with_dnssd:--with-dnssd-libs=x} \
 	%{?with_dnssd:--with-dnssd-includes=x} \
-	--with-java=%{_bindir}/java \
 	%{?with_perl:--with-perl=%{_bindir}/perl} \
 	%{?with_php:--with-php=%{_bindir}/php} \
 	%{?with_python:--with-python=%{_bindir}/python}
@@ -761,6 +727,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.293  2010/08/19 07:27:50  qboosh
+- java is no more - killed remnants
+
 Revision 1.292  2010/07/28 07:06:52  lisu
 - S: poppler-progs
 
================================================================

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