This commit was manufactured by cvs2git to create tag 'auto-ac-cups-

1_3_5-1'.

Sprout from master 2007-12-18 18:21:49 UTC Jan Rękorajski <baggins@pld-linux.org> '- up to 1.3.5'
Cherrypick from AC-branch 2007-12-19 23:28:08 UTC Elan Ruusamäe <glen@pld-linux.org> '- merged update to 1.3.5 from HEAD':
    cups.spec -> 1.202.2.1
Delete:
    cups-no-polluted-krb5config.patch

diff --git a/cups-no-polluted-krb5config.patch b/cups-no-polluted-krb5config.patch
deleted file mode 100644 (file)
index 87206f7..0000000
--- a/cups-no-polluted-krb5config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cups-1.3.4/config-scripts/cups-gssapi.m4~  2007-08-01 21:02:47.000000000 +0200
-+++ cups-1.3.4/config-scripts/cups-gssapi.m4   2007-12-06 23:18:40.000000000 +0100
-@@ -27,9 +27,9 @@
-                               ;;
-                       *)
-                               # Other platforms just ask for GSSAPI
--                              CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
--                              CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
--                              LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-+                              CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"         
-+                              CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"             
-+                              LIBGSSAPI="`CFLAGS= LDFLAGS= $KRB5CONFIG --libs gssapi`"
-                               ;;
-               esac
-               AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-       else

diff --git a/cups.spec b/cups.spec
index d127a3ba8ff784fe0b5373a707582b62bcb92787..5c486050183722eb0b096bb05a844ceb923e8cf5 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -9,6 +9,7 @@
 %bcond_without static_libs     # don't build static library
 #
 %include       /usr/lib/rpm/macros.perl
+%include       /usr/lib/rpm/macros.java
 %define                pdir CUPS
 
 %ifarch i386 i486 ppc
@@ -19,13 +20,13 @@ Summary:    Common Unix Printing System
 Summary(pl.UTF-8):     Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):  Sistema Unix de Impressão
 Name:          cups
-Version:       1.3.4
-Release:       4
+Version:       1.3.5
+Release:       1
 Epoch:         1
 License:       GPL/LGPL
 Group:         Applications/Printing
 Source0:       http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: 4bd20d69bb083b42632346a383b6aefb
+# Source0-md5: 355705c528e9a8d0d439da15454d79a6
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -40,7 +41,6 @@ Patch5:               %{name}-templates.patch
 Patch6:                %{name}-certs_FHS.patch
 Patch7:                %{name}-direct_usb.patch
 Patch8:                %{name}-satisfy-any.patch
-Patch9:                %{name}-no-polluted-krb5config.patch
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -51,25 +51,26 @@ BuildRequires:      glibc-headers
 %{?with_gnutls:BuildRequires:  gnutls-devel}
 %{?with_java:BuildRequires:    jar}
 %{?with_java:BuildRequires:    jdk}
-BuildRequires: krb5-devel
+%{?with_java:BuildRequires:    jpackage-utils}
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-BuildRequires: openldap-devel >= 2.4.6
+BuildRequires: openldap-devel
 BuildRequires: openslp-devel
 %{!?with_gnutls:BuildRequires: openssl-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
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.77.3
 Requires:      rc-scripts
-Obsoletes:     printingdaemon
 Provides:      printingdaemon
+Obsoletes:     printingdaemon
 Conflicts:     ghostscript < 7.05.4
 Conflicts:     logrotate < 3.7-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -125,8 +126,8 @@ Summary:    Common Unix Printing System Clients
 Summary(pl.UTF-8):     Aplikacje klienckie dla CUPS
 Group:         Applications/Printing
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     printingclient
 Provides:      printingclient
+Obsoletes:     printingclient
 
 %description clients
 Common Unix Printing System Clients.
@@ -160,7 +161,6 @@ Requires:   %{name}-image-lib = %{epoch}:%{version}-%{release}
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 # for libcups
 %{?with_gnutls:Requires:       gnutls-devel}
-Requires:      krb5-devel
 %{!?with_gnutls:Requires:      openssl-devel}
 Requires:      zlib-devel
 # for libcupsimage
@@ -228,7 +228,7 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 Summary:       CUPS java classes
 Summary(pl.UTF-8):     Klasy javy CUPS
 Group:         Development/Languages/Java
-Requires:      jre
+Requires:      jpackage-utils
 
 %description -n java-cups
 Common Unix Printing System Java classes.
@@ -236,6 +236,21 @@ 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}
+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
@@ -280,8 +295,8 @@ podłączonych do portów równoległych.
 Summary:       LPD compatibility support for CUPS print server
 Summary(pl.UTF-8):     Wsparcie dla LPD w serwerze wydruków CUPS
 Group:         Applications/Printing
-Requires:      rc-inetd
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      rc-inetd
 
 %description lpd
 LPD compatibility support for CUPS print server.
@@ -300,7 +315,6 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -351,9 +365,9 @@ cd ../..
 %if %{with java}
 cd scripting/java
 rm -rf classes/* cups.jar
-javac -d classes src/com/easysw/cups/*.java
+%javac -d classes src/com/easysw/cups/*.java
 cd classes
-jar cvf ../cups.jar com/easysw/cups
+%jar cvf ../cups.jar com/easysw/cups
 cd ../../..
 %endif
 
@@ -378,7 +392,7 @@ fi
 %{__make} -C scripting/php install \
        PHPDIR=$RPM_BUILD_ROOT%{php_extensiondir}
 install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
-cat > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/phpcups.ini << EOF
+cat > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/phpcups.ini << 'EOF'
 ; Enable phpcups extension module
 extension=phpcups.so
 EOF
@@ -391,14 +405,21 @@ EOF
 
 %if %{with java}
 install -d $RPM_BUILD_ROOT{%{_datadir}/java,%{_examplesdir}/java-cups-%{version}}
-install scripting/java/cups.jar $RPM_BUILD_ROOT%{_datadir}/java
+# jars
+cp -a scripting/java/cups.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+# examples
 cp -a scripting/java/{CUPSPrinter.java,example} $RPM_BUILD_ROOT%{_examplesdir}/java-cups-%{version}
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a scripting/java/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 %endif
 
 install %{SOURCE1}     $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2}     $RPM_BUILD_ROOT/etc/pam.d/%{name}
 install %{SOURCE3}     $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-install %{SOURCE4}      $RPM_BUILD_ROOT/etc/cups/mailto.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf
 sed -e 's|__ULIBDIR__|%{_ulibdir}|g' %{SOURCE5} > $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cups-lpd
 
 gzip -9nf $RPM_BUILD_ROOT%{_datadir}/%{name}/model/*.ppd
@@ -458,6 +479,9 @@ if [ "$1" = 0 ]; then
        %php_webserver_restart
 fi
 
+%post -n java-cups-javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %post lpd
 %service -q rc-inetd reload
 
@@ -631,8 +655,8 @@ fi
 %attr(755,root,root) %{_sbindir}/lpinfo
 %attr(755,root,root) %{_sbindir}/lpmove
 %attr(755,root,root) %{_sbindir}/reject
-%{_datadir}/applications/cups.desktop
-%{_datadir}/icons/hicolor/*/apps/cups.png
+%{_desktopdir}/cups.desktop
+%{_iconsdir}/hicolor/*/apps/cups.png
 %{_mandir}/man1/cancel.1*
 %{_mandir}/man1/lp.1*
 %{_mandir}/man1/lpoptions.1*
@@ -697,9 +721,13 @@ fi
 %if %{with java}
 %files -n java-cups
 %defattr(644,root,root,755)
-%doc scripting/java/docs/*
-%{_datadir}/java/cups.jar
+%{_javadir}/*.jar
 %{_examplesdir}/java-cups-%{version}
+
+%files -n java-cups-javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 %endif
 
 %files backend-usb