From: Arkadiusz Miśkiewicz Date: Sat, 29 Aug 2009 20:41:53 +0000 (+0000) Subject: - initial 1.4.0 update (builds; files need to be updated) X-Git-Tag: auto/th/cups-1_4_0-1~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcups.git;a=commitdiff_plain;h=afacd72e7172f354ec6ea49e3b9749db4b82d62c - initial 1.4.0 update (builds; files need to be updated) Changed files: cups-certs_FHS.patch -> 1.2 cups-config.patch -> 1.9 cups-lp-lpr.patch -> 1.2 cups-man_pages_linking.patch -> 1.4 cups-nostrip.patch -> 1.3 cups-translate.patch -> 1.2 cups-verbose-compilation.patch -> 1.2 cups.spec -> 1.263 --- diff --git a/cups-certs_FHS.patch b/cups-certs_FHS.patch index 1d6f11f..b8419d6 100644 --- a/cups-certs_FHS.patch +++ b/cups-certs_FHS.patch @@ -1,22 +1,19 @@ --- cups-1.2.7/config-scripts/cups-directories.m4.orig 2006-08-29 22:48:59.000000000 +0200 +++ cups-1.2.7/config-scripts/cups-directories.m4 2006-12-18 03:28:33.624756362 +0100 -@@ -311,8 +311,14 @@ - AC_SUBST(CUPS_SERVERROOT) - - # Transient run-time state --CUPS_STATEDIR="$localstatedir/run/cups" --AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups") +@@ -421,6 +421,13 @@ + CUPS_STATEDIR="$localstatedir/run/cups" + ;; + esac +AC_ARG_WITH(logdir, [ --with-statedir set path for certs state],statedir="$withval",statedir="") + +if test x$logdir = x; then -+ CUPS_STATEDIR="$localstatedir/lib/cups" ++ CUPS_STATEDIR="$localstatedir/lib/cups" +else -+ CUPS_STATEDIR="$statedir" ++ CUPS_STATEDIR="$statedir" +fi -+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") AC_SUBST(CUPS_STATEDIR) - dnl --- cups-1.2.7/config-scripts/cups-network.m4.orig 2006-10-20 17:07:21.000000000 +0200 +++ cups-1.2.7/config-scripts/cups-network.m4 2006-12-18 03:30:16.608100516 +0100 @@ -72,7 +72,7 @@ diff --git a/cups-config.patch b/cups-config.patch index 385ba72..d4404a0 100644 --- a/cups-config.patch +++ b/cups-config.patch @@ -8,6 +8,7 @@ diff -urN cups-1.2.0.org/conf/cupsd.conf.in cups-1.2.0/conf/cupsd.conf.in +MaxLogSize 0 +Printcap /etc/printcap + - # Log general information in error_log - change "info" to "debug" for - # troubleshooting... - LogLevel info + # Log general information in error_log - change "@CUPS_LOG_LEVEL@" to "debug" + # for troubleshooting... + LogLevel @CUPS_LOG_LEVEL@ + diff --git a/cups-lp-lpr.patch b/cups-lp-lpr.patch deleted file mode 100644 index ae6fc5f..0000000 --- a/cups-lp-lpr.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- cups-1.1.10/berkeley/lpr.c.orig Tue Jan 30 16:17:45 2001 -+++ cups-1.1.10/berkeley/lpr.c Tue Jan 30 16:18:18 2001 -@@ -324,7 +324,7 @@ - if (title) - job_id = cupsPrintFile(printer, tempfile, title, num_options, options); - else -- job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options); -+ job_id = cupsPrintFile(printer, tempfile, "STDIN", num_options, options); - - unlink(tempfile); - } ---- cups-1.1.10/systemv/lp.c.orig Tue Jan 30 16:16:32 2001 -+++ cups-1.1.10/systemv/lp.c Tue Jan 30 16:17:10 2001 -@@ -544,7 +544,7 @@ - if (title) - job_id = cupsPrintFile(printer, tempfile, title, num_options, options); - else -- job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options); -+ job_id = cupsPrintFile(printer, tempfile, "STDIN", num_options, options); - - unlink(tempfile); - } diff --git a/cups-man_pages_linking.patch b/cups-man_pages_linking.patch index 5732d7d..fba84c6 100644 --- a/cups-man_pages_linking.patch +++ b/cups-man_pages_linking.patch @@ -1,14 +1,32 @@ --- cups-1.2rc1/man/Makefile.wiget 2006-04-05 12:06:41.000000000 +0200 +++ cups-1.2rc1/man/Makefile 2006-04-05 12:07:50.000000000 +0200 -@@ -123,9 +123,9 @@ - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8DIR); \ +@@ -149,10 +149,10 @@ + done + for file in accept cupsreject reject; do \ + $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ +- $(LN) cupsaccept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ ++ echo ".so cupsaccept.$(MAN8EXT)" > $(AMANDIR)/man$(MAN8DIR)/$$file.$(MAN8EXT); \ done - $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) -- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) -+ echo ".so accept.$(MAN8EXT)" $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT) $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) - $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) -+ echo ".so cupsenable.$(MAN8EXT)" $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) ++ echo ".so cupsenable.$(MAN8EXT)" > $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT) # +--- cups-1.4.0/config-scripts/cups-manpages.m4~ 2009-01-12 20:17:09.000000000 +0100 ++++ cups-1.4.0/config-scripts/cups-manpages.m4 2009-08-29 22:32:49.346665192 +0200 +@@ -69,10 +69,10 @@ + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and Mac OS X +- MAN1EXT=1.gz +- MAN5EXT=5.gz +- MAN7EXT=7.gz +- MAN8EXT=8.gz ++ MAN1EXT=1 ++ MAN5EXT=5 ++ MAN7EXT=7 ++ MAN8EXT=8 + MAN8DIR=8 + ;; + *) diff --git a/cups-nostrip.patch b/cups-nostrip.patch index 08c23e9..2cfc1c8 100644 --- a/cups-nostrip.patch +++ b/cups-nostrip.patch @@ -1,11 +1,11 @@ ---- cups-1.2.0.org/Makedefs.in 2006-04-27 13:40:30.000000000 +0000 -+++ cups-1.2.0/Makedefs.in 2006-05-11 21:43:13.378701000 +0000 -@@ -43,7 +43,7 @@ - RMDIR = @RMDIR@ - SED = @SED@ - SHELL = /bin/sh --STRIP = @STRIP@ -+STRIP = /bin/true +--- cups-1.4.0/configure~ 2009-08-28 17:35:34.000000000 +0200 ++++ cups-1.4.0/configure 2009-08-29 21:27:34.296848459 +0200 +@@ -10815,8 +10815,6 @@ - # - # Installation programs... + if test x$enable_debug = xyes; then + OPTIM="-g" +-else +- INSTALL_STRIP="-s" + fi + + if test x$enable_debug_printfs = xyes; then diff --git a/cups-translate.patch b/cups-translate.patch deleted file mode 100644 index 4607fd5..0000000 --- a/cups-translate.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- cups-1.3.7/locale/translate.c~ 2008-07-19 22:39:11.000000000 +0300 -+++ cups-1.3.7/locale/translate.c 2008-07-19 22:39:54.082523396 +0300 -@@ -293,16 +293,16 @@ - *bufptr = '\0'; - - /* -- * Find the first textarea element - that will have the translation data... -+ * Find the div containing translation - */ - -- if ((bufptr = strstr(buffer, "")) == NULL) -+ if ((bufend = strstr(bufptr, "")) == NULL) - { - /* - * textarea doesn't close, abort! - */ - -- puts("/TEXTAREA SHORT DATA!"); -+ puts("/DIV SHORT DATA!"); - ret = 0; - break; - } diff --git a/cups-verbose-compilation.patch b/cups-verbose-compilation.patch index b3df74c..1566ee0 100644 --- a/cups-verbose-compilation.patch +++ b/cups-verbose-compilation.patch @@ -1,11 +1,12 @@ --- cups-1.3.7/Makedefs.in~ 2008-04-11 07:59:17.000000000 +0200 +++ cups-1.3.7/Makedefs.in 2008-04-11 07:59:50.000000000 +0200 -@@ -241,7 +241,7 @@ +@@ -258,7 +258,7 @@ # Rules... # -.SILENT: +#.SILENT: - .SUFFIXES: .1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz + .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz .c.o: + diff --git a/cups.spec b/cups.spec index 25221e0..d6be6ca 100644 --- a/cups.spec +++ b/cups.spec @@ -4,46 +4,36 @@ %bcond_without dnssd %bcond_without php # don't build PHP extension/support in web interface %bcond_without perl # don't build Perl extension/support in web interface -%bcond_without java # don't build Java extension/support in web interface %bcond_without python # don't build Python support in web interface %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 -%undefine with_java -%endif - -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.11 -Release: 3 +Version: 1.4.0 +Release: 0.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: 17f3e2bcb3cae3dd9dceb65a2bfd295f +# Source0-md5: bc5e777d4320cecdd1a64de8035171a8 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate Source4: %{name}.mailto.conf Source5: %{name}-lpd.inetd Patch0: %{name}-config.patch -Patch1: %{name}-lp-lpr.patch Patch2: %{name}-options.patch Patch3: %{name}-man_pages_linking.patch Patch4: %{name}-nostrip.patch Patch5: %{name}-certs_FHS.patch Patch6: %{name}-direct_usb.patch Patch7: %{name}-no-polluted-krb5config.patch -Patch8: %{name}-java-fix.patch Patch9: %{name}-verbose-compilation.patch Patch10: %{name}-peercred.patch -Patch11: %{name}-translate.patch URL: http://www.cups.org/ BuildRequires: acl-devel BuildRequires: autoconf @@ -334,17 +324,14 @@ Wsparcie dla LPD w serwerze wydruków CUPS. %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 %build %{__aclocal} -I config-scripts @@ -371,7 +358,7 @@ 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:--with-java} \ + --with-java=%{_bindir}/java \ %{?with_perl:--with-perl} \ %{?with_php:--with-php} \ %{?with_python:--with-python} @@ -394,15 +381,6 @@ cd scripting/perl cd ../.. %endif -%if %{with java} -cd scripting/java -rm -rf classes/* cups.jar -%javac -d classes src/com/easysw/cups/*.java -cd classes -%jar cvf ../cups.jar com/easysw/cups -cd ../../.. -%endif - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security,sysconfig/rc-inetd} \ @@ -437,27 +415,12 @@ EOF DESTDIR=$RPM_BUILD_ROOT %endif -%if %{with java} -install -d $RPM_BUILD_ROOT{%{_javadir},%{_examplesdir}/java-cups-%{version}} -# 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%{_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 - touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log} touch $RPM_BUILD_ROOT/etc/security/blacklist.cups touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers,client}.conf @@ -513,9 +476,6 @@ 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 @@ -536,8 +496,8 @@ fi %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.conf %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mailto.conf %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snmp.conf -%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs -%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.types +#%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs +#%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.types %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups %dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl %dir %{_sysconfdir}/%{name}/interfaces @@ -557,19 +517,19 @@ fi %attr(755,root,root) %{_ulibdir}/cups/cgi-bin/*.cgi %{_ulibdir}/cups/cgi-bin/*.css %{_ulibdir}/cups/cgi-bin/*.html -%{_ulibdir}/cups/cgi-bin/*.ico +#%{_ulibdir}/cups/cgi-bin/*.ico %{_ulibdir}/cups/cgi-bin/*.txt %lang(de) %{_ulibdir}/cups/cgi-bin/de %lang(es) %{_ulibdir}/cups/cgi-bin/es -%lang(et) %{_ulibdir}/cups/cgi-bin/et -%lang(fr) %{_ulibdir}/cups/cgi-bin/fr -%lang(he) %{_ulibdir}/cups/cgi-bin/he -%lang(id) %{_ulibdir}/cups/cgi-bin/id -%lang(it) %{_ulibdir}/cups/cgi-bin/it +%lang(eu) %{_ulibdir}/cups/cgi-bin/eu +#%lang(fr) %{_ulibdir}/cups/cgi-bin/fr +#%lang(he) %{_ulibdir}/cups/cgi-bin/he +#%lang(id) %{_ulibdir}/cups/cgi-bin/id +#%lang(it) %{_ulibdir}/cups/cgi-bin/it %lang(ja) %{_ulibdir}/cups/cgi-bin/ja %lang(pl) %{_ulibdir}/cups/cgi-bin/pl -%lang(sv) %{_ulibdir}/cups/cgi-bin/sv -%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW +%lang(ru) %{_ulibdir}/cups/cgi-bin/ru +#%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW %exclude %{_ulibdir}/cups/backend/usb %exclude %{_ulibdir}/cups/backend/serial @@ -588,7 +548,7 @@ fi %{_datadir}/cups/drivers %{_datadir}/cups/fonts %dir %{_datadir}/cups/model -%{_datadir}/cups/model/*.ppd.gz +#%{_datadir}/cups/model/*.ppd.gz # dirs for gimp-print-cups-4.2.7-1 %dir %{_datadir}/cups/model/C %lang(da) %dir %{_datadir}/cups/model/da @@ -602,15 +562,15 @@ fi %{_datadir}/cups/templates/*.tmpl %lang(de) %{_datadir}/cups/templates/de %lang(es) %{_datadir}/cups/templates/es -%lang(et) %{_datadir}/cups/templates/et -%lang(fr) %{_datadir}/cups/templates/fr -%lang(he) %{_datadir}/cups/templates/he -%lang(id) %{_datadir}/cups/templates/id -%lang(it) %{_datadir}/cups/templates/it +%lang(eu) %{_datadir}/cups/templates/eu +#%lang(fr) %{_datadir}/cups/templates/fr +#%lang(he) %{_datadir}/cups/templates/he +#%lang(id) %{_datadir}/cups/templates/id +#%lang(it) %{_datadir}/cups/templates/it %lang(ja) %{_datadir}/cups/templates/ja %lang(pl) %{_datadir}/cups/templates/pl -%lang(sv) %{_datadir}/cups/templates/sv -%lang(zh_TW) %{_datadir}/cups/templates/zh_TW +%lang(ru) %{_datadir}/cups/templates/ru +#%lang(zh_TW) %{_datadir}/cups/templates/zh_TW %{_mandir}/man1/cupstestppd.1* %{_mandir}/man1/cupstestdsc.1* %{_mandir}/man1/lppasswd.1* @@ -653,11 +613,11 @@ fi %lang(da) %{_datadir}/locale/da/cups_da.po %lang(de) %{_datadir}/locale/de/cups_de.po %lang(es) %{_datadir}/locale/es/cups_es.po -%lang(et) %{_datadir}/locale/et/cups_et.po +%lang(eu) %{_datadir}/locale/eu/cups_eu.po %lang(fi) %{_datadir}/locale/fi/cups_fi.po %lang(fr) %{_datadir}/locale/fr/cups_fr.po -%lang(he) %{_datadir}/locale/he/cups_he.po -%lang(id) %{_datadir}/locale/id/cups_id.po +#%lang(he) %{_datadir}/locale/he/cups_he.po +#%lang(id) %{_datadir}/locale/id/cups_id.po %lang(it) %{_datadir}/locale/it/cups_it.po %lang(ko) %{_datadir}/locale/ko/cups_ko.po %lang(ja) %{_datadir}/locale/ja/cups_ja.po @@ -755,18 +715,6 @@ fi %config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpcups.ini %endif -%if %{with java} -%files -n java-cups -%defattr(644,root,root,755) -%{_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 %defattr(644,root,root,755) %attr(755,root,root) %{_ulibdir}/cups/backend/usb