- up to 1.2.11; cups-templates.patch is problematic - no idea why it's here

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index f7a2fb3d033274e9893f56063b65c294193e7a03..82fd6f14a0d54c9f1ba6b4736e7aa3415a2696fd 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -15,16 +15,17 @@ 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.2.7
-Release:       4
+Version:       1.2.11
+Release:       0.1
 Epoch:         1
 License:       GPL/LGPL
 Group:         Applications/Printing
 Source0:       http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: bf44783d9b46130bee9f2995e6055470
+# Source0-md5: 2742f1eec38abb04472b86627da8e493
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
+Source4:       %{name}.mailto.conf
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-lp-lpr.patch
 Patch2:                %{name}-options.patch
@@ -32,7 +33,6 @@ Patch3:               %{name}-man_pages_linking.patch
 Patch4:                %{name}-nostrip.patch
 Patch5:                %{name}-templates.patch
 Patch6:                %{name}-certs_FHS.patch
-Patch7:                %{name}-str2111.patch
 URL:           http://www.cups.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -250,9 +250,9 @@ podłączonych do portów równoległych.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+# WHY THIS IS NEEDED?
+#%patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -292,7 +292,7 @@ cd ../..
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security} \
        $RPM_BUILD_ROOT/var/run/cups \
-       $RPM_BUILD_ROOT/var/log/{,archiv/}cups
+       $RPM_BUILD_ROOT/var/log/{,archive/}cups
 
 %{__make} install \
        BUILDROOT=$RPM_BUILD_ROOT \
@@ -325,6 +325,7 @@ cd ../..
 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
 
 gzip -9nf $RPM_BUILD_ROOT%{_datadir}/%{name}/model/*.ppd
 
@@ -388,6 +389,7 @@ fi
 %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/classes.conf
 %attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cupsd.conf
 %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(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
@@ -412,10 +414,12 @@ fi
 %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(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
 
 %exclude %{_ulibdir}/cups/backend/usb
 %exclude %{_ulibdir}/cups/backend/serial
@@ -449,10 +453,12 @@ fi
 %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(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
 %{_mandir}/man7/backend.7*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
@@ -462,10 +468,12 @@ fi
 %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(fr) %{_datadir}/locale/fr/cups_fr.po
 %lang(it) %{_datadir}/locale/it/cups_it.po
 %lang(ja) %{_datadir}/locale/ja/cups_ja.po
 %lang(pl) %{_datadir}/locale/pl/cups_pl.po
 %lang(sv) %{_datadir}/locale/sv/cups_sv.po
+%lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po
 
 %dir %attr(775,root,lp) /var/cache/cups
 %dir %attr(755,root,lp) /var/lib/cups
@@ -477,7 +485,7 @@ fi
 %attr(640,root,lp) %ghost /var/cache/cups/job.cache
 %attr(600,lp,lp) %ghost /var/cache/cups/ppds.dat
 %attr(640,root,lp) %ghost /var/cache/cups/remote.cache
-%attr(750,root,logs) %dir /var/log/archiv/cups
+%attr(750,root,logs) %dir /var/log/archive/cups
 %attr(750,root,logs) %dir /var/log/cups
 %attr(640,root,logs) %ghost /var/log/cups/access_log
 %attr(640,root,logs) %ghost /var/log/cups/error_log