- java is no more - killed remnants

Changed files:
    cups-java-fix.patch -> 1.2
    cups.spec -> 1.293

diff --git a/cups-java-fix.patch b/cups-java-fix.patch
deleted file mode 100644 (file)
index 724a54c..0000000
--- a/cups-java-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- cups-1.3.6/scripting/java/src/com/easysw/cups/IPPAttribute.java.orig       2008-01-07 20:15:28.000000000 +0100
-+++ cups-1.3.6/scripting/java/src/com/easysw/cups/IPPAttribute.java    2008-03-01 15:54:29.368987179 +0100
-@@ -25,6 +25,8 @@
-  * @since     JDK1.3
-  */
- import java.util.*;
-+import java.nio.charset.Charset;
-+import java.nio.ByteBuffer;
- 
- public class IPPAttribute
- {
-@@ -263,7 +265,7 @@
-   {
-     IPPValue val;
-     int      bytes = 0;          // Start with one for the group tag.
--    Charset  utf8 = Charset::forName("UTF-8");
-+    Charset  utf8 = Charset.forName("UTF-8");
-     ByteBuffer temp;
- 
-     //
-@@ -369,7 +371,7 @@
-     int    i,j, n;
-     int    bi    = 0;          // Start with one for the group tag.
-     byte[] bytes = new byte[sz];
--    Charset  utf8 = Charset::forName("UTF-8");
-+    Charset  utf8 = Charset.forName("UTF-8");
-     ByteBuffer temp;
- 
-     if (group_tag != last_group)

diff --git a/cups.spec b/cups.spec
index 5559ce75a458ac66e8470acdce55b020308ef0d9..e1f1ed33b1156bdb4baf758da5df039d9303f9d5 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -51,9 +51,6 @@ BuildRequires:        dbus-devel
 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
@@ -67,7 +64,6 @@ BuildRequires:        libusb-devel
 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
@@ -242,35 +238,6 @@ PHP module for Common Unix Printing System.
 %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
@@ -376,7 +343,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
        --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}