X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cups.spec;h=4c78d53887274a2df87c549f8ef77a326a481c54;hb=c0b7c9e55194ef63a695eac7e5e22f479305e5f1;hp=aa644cb44861078bef83e58db40d7b0d1c4ec5bf;hpb=6ebf74dd1e1dd1867b43546965800fc327d04938;p=packages%2Fcups.git diff --git a/cups.spec b/cups.spec index aa644cb..4c78d53 100644 --- a/cups.spec +++ b/cups.spec @@ -1,28 +1,12 @@ -Summary: Common Unix Printing System +Summary: Common Unix Printing System Summary(pl): Popularny System Druku dla Unixa Summary(pt_BR): Sistema Unix de Impressão Name: cups -Version: 1.1.14 -Release: 2 +Version: 1.1.18 +Release: 3 Epoch: 1 License: GPL/LGPL -Group: Applications/System -Group(cs): Aplikace/Systém -Group(da): Programmer/System -Group(de): Applikationen/System -Group(es): Aplicaciones/Sistema -Group(fr): Applications/Système -Group(is): Forrit/Kerfisforrit -Group(it): Applicazioni/Sistema -Group(ja): ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó/¥·¥¹¥Æ¥à -Group(no): Applikasjoner/System -Group(pl): Aplikacje/System -Group(pt): Aplicações/Sistema -Group(pt_BR): Aplicações/Sistema -Group(ru): ðÒÉÌÏÖÅÎÉÑ/óÉÓÔÅÍÁ -Group(sl): Programi/Sistem -Group(sv): Tillämpningar/System -Group(uk): ðÒÉËÌÁÄΦ ðÒÏÇÒÁÍÉ/óÉÓÔÅÍÁ +Group: Applications/Printing Source0: ftp://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2 Source1: %{name}.init Source2: %{name}.pamd @@ -32,24 +16,25 @@ Patch1: %{name}-config.patch Patch2: %{name}-tmpdir.patch Patch3: %{name}-lp-lpr.patch Patch4: %{name}-options.patch -Patch5: %{name}-pstoraster-gcc-2.96.patch -Patch6: %{name}-ENCRYPTIONtxt.patch -URL: http://www.cups.org/ +Patch5: %{name}-ENCRYPTIONtxt.patch +Patch6: %{name}-man_pages_linking.patch +Patch7: %{name}-nolibs.patch +URL: http://www.cups.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: openssl-devel >= 0.9.6b +BuildRequires: openssl-devel >= 0.9.7 BuildRequires: pam-devel -Prereq: %{name}-libs = %{version} -Prereq: /sbin/chkconfig -Provides: lpr +BuildRequires: pkgconfig +PreReq: %{name}-libs = %{version} +PreReq: /sbin/chkconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: lpr Obsoletes: LPRng -%description +%description CUPS provides a portable printing layer for UNIX®-based operating systems. It has been developed by Easy Software Products to promote a standard printing solution for all UNIX vendors and users. CUPS @@ -74,28 +59,11 @@ port Summary: Common Unix Printing System Libraries Summary(pl): Biblioteki dla CUPS Summary(pt_BR): Sistema Unix de Impressão - bibliotecas para uso em clientes cups -Group: Development/Libraries -Group(cs): Vývojové prostøedky/Knihovny -Group(da): Udvikling/Biblioteker -Group(de): Entwicklung/Bibliotheken -Group(es): Desarrollo/Bibliotecas -Group(fr): Development/Librairies -Group(is): Þróunartól/Aðgerðasöfn -Group(it): Sviluppo/Librerie -Group(ja): ³«È¯/¥é¥¤¥Ö¥é¥ê -Group(no): Utvikling/Bibliotek -Group(pl): Programowanie/Biblioteki -Group(pt_BR): Desenvolvimento/Bibliotecas -Group(pt): Desenvolvimento/Bibliotecas -Group(ru): òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ -Group(sl): Razvoj/Knji¾nice -Group(sv): Utveckling/Bibliotek -Group(uk): òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ +Group: Libraries Provides: %{name}-libs = %{epoch}:%{version}-%{release} Obsoletes: %{name}-libs Obsoletes: libcups1 - %description lib Common Unix Printing System Libraries. @@ -105,27 +73,25 @@ Biblioteki dla CUPS. %description lib -l pt_BR Bibliotecas CUPS requeridas pelos clientes CUPS. +%package clients +Summary: Common Unix Printing System Clients +Summary(pl): Aplikacje klienckie dla CUPS +Group: Applications/Printing +Provides: %{name}-clients = %{epoch}:%{version}-%{release} +Conflicts: LPRng + +%description clients +Common Unix Printing System Clients. + +%description clients -l pl +Aplikacje klienckie dla CUPS. + %package image-lib Summary: Common Unix Printing System Libraries - images manipulation Summary(pl): Biblioteki dla CUPS - obs³uga formatów graficznych Summary(pt_BR): Sistema Unix de Impressão - bibliotecas para uso em clientes cups -Group: Development/Libraries -Group(cs): Vývojové prostøedky/Knihovny -Group(da): Udvikling/Biblioteker -Group(de): Entwicklung/Bibliotheken -Group(es): Desarrollo/Bibliotecas -Group(fr): Development/Librairies -Group(is): Þróunartól/Aðgerðasöfn -Group(it): Sviluppo/Librerie -Group(ja): ³«È¯/¥é¥¤¥Ö¥é¥ê -Group(no): Utvikling/Bibliotek -Group(pl): Programowanie/Biblioteki -Group(pt_BR): Desenvolvimento/Bibliotecas -Group(pt): Desenvolvimento/Bibliotecas -Group(ru): òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ -Group(sl): Razvoj/Knji¾nice -Group(sv): Utveckling/Bibliotek -Group(uk): òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ +Group: Libraries +Requires: %{name}-lib = %{epoch}:%{version}-%{release} Obsoletes: libcups1 %description image-lib @@ -142,22 +108,6 @@ Summary: Common Unix Printing System development files Summary(pl): Popularny System Druku dla Unixa, pliki nag³ówkowe Summary(pt_BR): Sistema Unix de Impressão - ambiente de desenvolvimento Group: Development/Libraries -Group(cs): Vývojové prostøedky/Knihovny -Group(da): Udvikling/Biblioteker -Group(de): Entwicklung/Bibliotheken -Group(es): Desarrollo/Bibliotecas -Group(fr): Development/Librairies -Group(is): Þróunartól/Aðgerðasöfn -Group(it): Sviluppo/Librerie -Group(ja): ³«È¯/¥é¥¤¥Ö¥é¥ê -Group(no): Utvikling/Bibliotek -Group(pl): Programowanie/Biblioteki -Group(pt_BR): Desenvolvimento/Bibliotecas -Group(pt): Desenvolvimento/Bibliotecas -Group(ru): òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ -Group(sl): Razvoj/Knji¾nice -Group(sv): Utveckling/Bibliotek -Group(uk): òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ Requires: %{name}-lib = %{version} Requires: %{name}-image-lib = %{version} Obsoletes: libcups1-devel @@ -178,22 +128,6 @@ Summary: Common Unix Printing System static libraries Summary(pl): Popularny System Druku dla Unixa, biblioteki statyczne Summary(pt_BR): Common Unix Printing System - bibliotecas estáticas Group: Development/Libraries -Group(cs): Vývojové prostøedky/Knihovny -Group(da): Udvikling/Biblioteker -Group(de): Entwicklung/Bibliotheken -Group(es): Desarrollo/Bibliotecas -Group(fr): Development/Librairies -Group(is): Þróunartól/Aðgerðasöfn -Group(it): Sviluppo/Librerie -Group(ja): ³«È¯/¥é¥¤¥Ö¥é¥ê -Group(no): Utvikling/Bibliotek -Group(pl): Programowanie/Biblioteki -Group(pt_BR): Desenvolvimento/Bibliotecas -Group(pt): Desenvolvimento/Bibliotecas -Group(ru): òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ -Group(sl): Razvoj/Knji¾nice -Group(sv): Utveckling/Bibliotek -Group(uk): òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ Requires: %{name}-devel = %{version} %description static @@ -210,25 +144,27 @@ bibliotecas do CUPS. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +# wtf? +#%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build -aclocal -autoconf +%{__aclocal} +%{__autoconf} %configure \ --with-docdir=%{_libdir}/%{name}/cgi-bin %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d} \ +install -d $RPM_BUILD_ROOT/etc/{{rc.d/init.d,pam.d,logrotate.d},security} \ $RPM_BUILD_ROOT/var/log/{,archiv/}cups -%{__make} DESTDIR=$RPM_BUILD_ROOT install +%{__make} DESTDIR=$RPM_BUILD_ROOT install install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name} @@ -240,23 +176,24 @@ cp doc/*.css $RPM_BUILD_ROOT/%{_libdir}/%{name}/cgi-bin/ cp doc/images/* $RPM_BUILD_ROOT/%{_libdir}/%{name}/cgi-bin/images/ touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log} +touch $RPM_BUILD_ROOT/etc/security/blacklist.cups -gzip -9nf *.txt +#ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT/%{_libdir}/%{name}/backend/smb %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add cups -if [ -f /var/lock/subsys/cups ]; then - /etc/rc.d/init.d/cups restart 1>&2 +if [ -f /var/lock/subsys/cupsd ]; then + /etc/rc.d/init.d/cups restart 1>&2 else - echo "Run \"/etc/rc.d/init.d/cups start\" to start cups daemon." + echo "Run \"/etc/rc.d/init.d/cups start\" to start cups daemon." fi - + %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/cups ]; then + if [ -f /var/lock/subsys/cupsd ]; then /etc/rc.d/init.d/cups stop 1>&2 fi /sbin/chkconfig --del cups @@ -270,46 +207,51 @@ fi %files %defattr(644,root,root,755) #%doc *.gz doc/*.html doc/*.css doc/images -%doc *.gz +%doc *.txt %attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/* %attr(754,root,root) /etc/rc.d/init.d/cups %dir %{_sysconfdir}/%{name} -%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*.conf +%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/classes.conf +%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/cupsd.conf +%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/printers.conf %attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*.convs %attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*.types +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups %dir %{_sysconfdir}/%{name}/certs %dir %{_sysconfdir}/%{name}/interfaces %dir %{_sysconfdir}/%{name}/ppd -%attr(644,root,root) %{_sysconfdir}/logrotate.d/%{name} +%attr(644,root,root) /etc/logrotate.d/%{name} %attr(4755,lp,root) %{_bindir}/lppasswd -%attr(755,root,root) %{_bindir}/cancel %attr(755,root,root) %{_bindir}/disable %attr(755,root,root) %{_bindir}/enable -%attr(755,root,root) %{_bindir}/lp -%attr(755,root,root) %{_bindir}/lpoptions -%attr(755,root,root) %{_bindir}/lpq -%attr(755,root,root) %{_bindir}/lpr -%attr(755,root,root) %{_bindir}/lprm -%attr(755,root,root) %{_bindir}/lpstat %dir %{_libdir}/cups %dir %{_libdir}/cups/* -%attr(755,root,root) %{_libdir}/cups/*/* +%attr(755,root,root) %{_libdir}/cups/*/* %attr(755,root,root) %{_sbindir}/* %{_datadir}/cups -%{_mandir}/man[158]/* -%lang(C) %{_datadir}/locale/C/cups_C +%{_mandir}/man1/backend.1* +%{_mandir}/man1/cupstestppd.1* +%{_mandir}/man1/filter.1* +%{_mandir}/man1/lppasswd.1* +%{_mandir}/man[58]/* +%lang(fr) %{_mandir}/fr/man1/backend.1* +%lang(fr) %{_mandir}/fr/man1/cupstestppd.1* +%lang(fr) %{_mandir}/fr/man1/filter.1* +%lang(fr) %{_mandir}/fr/man1/lppasswd.1* +%lang(fr) %{_mandir}/fr/man[58]/* +%{_datadir}/locale/C/cups_C %lang(be) %{_datadir}/locale/be/cups_be %lang(cs) %{_datadir}/locale/cs/cups_cs %lang(de) %{_datadir}/locale/de/cups_de -%lang(en) %{_datadir}/locale/en/cups_en +%{_datadir}/locale/en/cups_en %lang(es) %{_datadir}/locale/es/cups_es %lang(fr) %{_datadir}/locale/fr/cups_fr %lang(he) %{_datadir}/locale/he/cups_he %lang(it) %{_datadir}/locale/it/cups_it -%lang(ru_RU) %{_datadir}/locale/ru_RU.*/cups_ru_RU.* +%lang(ru) %{_datadir}/locale/ru_RU.*/cups_ru_RU.* %lang(sv) %{_datadir}/locale/sv/cups_sv %lang(uk) %{_datadir}/locale/uk/cups_uk -%lang(uk_UA) %{_datadir}/locale/uk_UA.*/cups_uk_UA.* +%lang(uk) %{_datadir}/locale/uk_UA.*/cups_uk_UA.* %lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN /var/spool/cups %attr(750,root,root) %dir /var/log/archiv/cups @@ -322,6 +264,31 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcups.so.* +%files clients +%defattr(644,root,root,755) +%attr(644,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/client.conf +%attr(755,root,root) %{_bindir}/cancel +%attr(755,root,root) %{_bindir}/lp +%attr(755,root,root) %{_bindir}/lpoptions +%attr(755,root,root) %{_bindir}/lpq +%attr(755,root,root) %{_bindir}/lpr +%attr(755,root,root) %{_bindir}/lprm +%attr(755,root,root) %{_bindir}/lpstat +%{_mandir}/man1/cancel.1* +%{_mandir}/man1/lp.1* +%{_mandir}/man1/lpoptions.1* +%{_mandir}/man1/lpq.1* +%{_mandir}/man1/lpr.1* +%{_mandir}/man1/lprm.1* +%{_mandir}/man1/lpstat.1* +%lang(fr) %{_mandir}/fr/man1/cancel.1* +%lang(fr) %{_mandir}/fr/man1/lp.1* +%lang(fr) %{_mandir}/fr/man1/lpoptions.1* +%lang(fr) %{_mandir}/fr/man1/lpq.1* +%lang(fr) %{_mandir}/fr/man1/lpr.1* +%lang(fr) %{_mandir}/fr/man1/lprm.1* +%lang(fr) %{_mandir}/fr/man1/lpstat.1* + %files image-lib %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libcupsimage.so.* @@ -332,6 +299,7 @@ fi %{_includedir}/cups %{_libdir}/lib*.so %{_mandir}/man3/* +%lang(fr) %{_mandir}/fr/man3/* %files static %defattr(644,root,root,755)