Author: arekm Date: Thu Aug 16 07:27:37 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - 1.3.0 moved from DEVEL branch; 1.2 moved to CUPS_1_2 branch
---- Files affected: SPECS: cups.spec (1.203 -> 1.204) ---- Diffs: ================================================================ Index: SPECS/cups.spec diff -u SPECS/cups.spec:1.203 SPECS/cups.spec:1.204 --- SPECS/cups.spec:1.203 Wed Aug 1 19:21:50 2007 +++ SPECS/cups.spec Thu Aug 16 09:27:32 2007 @@ -6,8 +6,11 @@ # # Conditional build: %bcond_with gnutls # use GNU TLS for SSL/TLS support (instead of OpenSSL) +%bcond_without dnssd %bcond_without php # don't build PHP extension %bcond_without perl # don't build Perl extension +%bcond_without java +%bcond_without python %bcond_without static_libs # don't build static library # %include /usr/lib/rpm/macros.perl @@ -16,13 +19,13 @@ Summary(pl.UTF-8): Ogólny system druku dla Uniksa Summary(pt_BR.UTF-8): Sistema Unix de Impressão Name: cups -Version: 1.2.12 -Release: 2 +Version: 1.3.0 +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: d410658468384b5ba5d04a808f6157fe +Source0: http://dl.sourceforge.net/cups/%{name}-%{version}-source.tar.bz2 +# Source0-md5: ae2855d5d1ab5b5fcbb8a2613cefec14 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate @@ -34,12 +37,16 @@ Patch4: %{name}-nostrip.patch Patch5: %{name}-templates.patch Patch6: %{name}-certs_FHS.patch +Patch7: %{name}-direct_usb.patch URL: http://www.cups.org/ BuildRequires: acl-devel BuildRequires: autoconf BuildRequires: automake +%{?with_dnssd:BuildRequires: avahi-compat-libdns_sd-devel} BuildRequires: dbus-devel +BuildRequires: glibc-headers %{?with_gnutls:BuildRequires: gnutls-devel} +BuildRequires: krb5-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel @@ -254,6 +261,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %{__aclocal} -I config-scripts @@ -261,15 +269,27 @@ %configure \ --libdir=%{_ulibdir} \ --enable-shared \ + --with-cups-user=lp \ + --with-cups-group=sys \ + --with-system-groups=sys \ + --with-printcap=/etc/printcap \ %{?with_static_libs:--enable-static} \ --enable-ssl \ --%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \ --%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \ + --%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \ --disable-cdsassl \ --enable-dbus \ %{?debug:--enable-debug} \ --with-docdir=%{_ulibdir}/%{name}/cgi-bin \ - %{?with_php:--with-php} + --with-config-file-perm=0640 \ + --with-log-file-perm=0640 \ + %{?with_dnssd:--with-dnssd-libs=x} \ + %{?with_dnssd:--with-dnssd-includes=x} \ + %{?with_php:--with-php} \ + %{?with_perl:--with-perl} \ + %{?with_java:--with-java} \ + %{?with_php:--with-python} %{__make} @@ -399,7 +419,9 @@ %attr(4755,lp,root) %{_bindir}/lppasswd %attr(755,root,root) %{_bindir}/cupstestppd %attr(755,root,root) %{_bindir}/cupstestdsc +%attr(755,root,root) %{_sbindir}/cupsctl %attr(755,root,root) %{_sbindir}/cupsd +%attr(755,root,root) %{_sbindir}/cupsfilter %dir %{_ulibdir}/cups %dir %{_ulibdir}/cups/* @@ -414,6 +436,7 @@ %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(it) %{_ulibdir}/cups/cgi-bin/it %lang(ja) %{_ulibdir}/cups/cgi-bin/ja %lang(pl) %{_ulibdir}/cups/cgi-bin/pl @@ -453,6 +476,7 @@ %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(it) %{_datadir}/cups/templates/it %lang(ja) %{_datadir}/cups/templates/ja %lang(pl) %{_datadir}/cups/templates/pl @@ -464,14 +488,25 @@ %{_mandir}/man7/filter.7* %{_mandir}/man1/lppasswd.1* %{_mandir}/man[58]/* +%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(fi) %{_datadir}/locale/fi/cups_fi.po %lang(fr) %{_datadir}/locale/fr/cups_fr.po +%lang(he) %{_datadir}/locale/he/cups_he.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 +%lang(nl) %{_datadir}/locale/nl/cups_nl.po +%lang(no) %{_datadir}/locale/no/cups_no.po %lang(pl) %{_datadir}/locale/pl/cups_pl.po +%lang(pt) %{_datadir}/locale/pt/cups_pt.po +%lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po +%lang(pt_PT) %{_datadir}/locale/pt_PT/cups_pt_PT.po +%lang(ru) %{_datadir}/locale/ru/cups_ru.po %lang(sv) %{_datadir}/locale/sv/cups_sv.po +%lang(zh) %{_datadir}/locale/zh/cups_zh.po %lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po %dir %attr(775,root,lp) /var/cache/cups @@ -593,41 +628,31 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.203 2007/08/01 17:21:50 patrys -- virtual provides/obsoletes instead of obsoleting each other -- fixes behaviour in package managers other than poldek -- rel up -- STBR +Revision 1.204 2007/08/16 07:27:32 arekm +- 1.3.0 moved from DEVEL branch; 1.2 moved to CUPS_1_2 branch -Revision 1.202 2007/07/13 08:17:49 arekm -- up to 1.2.12 +Revision 1.192.2.4 2007/08/16 07:24:12 arekm +- final 1.3.0 -Revision 1.201 2007/06/14 18:02:38 arekm -- rel 2 +Revision 1.192.2.3 2007/04/15 19:44:47 wolvverine +- up to r6446 -Revision 1.200 2007/06/02 10:56:11 arekm -- rel 1; so maybe someone should bugreport templates problem to upstream? +Revision 1.192.2.2 2007/04/02 05:27:56 wolvverine +- up to rev.6397 -Revision 1.199 2007/06/01 17:06:35 qboosh -- updated templates patch (needed to get working URLs in UI) +Revision 1.192.2.1 2007/03/03 15:28:17 glen +- 1.3 moved to DEVEL +- use source that exists -Revision 1.198 2007/06/01 11:45:10 arekm -- up to 1.2.11; cups-templates.patch is problematic - no idea why it's here +Revision 1.192 2007/03/03 15:04:18 glen +- move crapo removal -Revision 1.197 2007/04/02 16:59:15 baggins -- rel 2 +Revision 1.191 2007/03/03 15:02:28 glen +- adapter, remove crapola +- it is not 1.3 release but svn snapshot (denote it in release and changelog) -Revision 1.196 2007/04/02 16:55:17 baggins -- s|/var/log/archiv|/var/log/archive|g - -Revision 1.195 2007/03/20 22:46:12 rotom -- up to 1.2.10 - -Revision 1.194 2007/03/16 19:33:53 twittner -- up to 1.2.9 - -Revision 1.193 2007/03/03 15:29:35 glen -- revert 1.3 on HEAD (moved to DEVEL) +Revision 1.190 2007/03/03 14:36:45 wolvverine +- up to 1.3 snapshot (svn r6309) Revision 1.189 2007/02/22 18:09:29 wolvverine - add mailto.conf file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.203&r2=1.204&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
