X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cups.spec;h=7d69702a9ead20ba6a99734f64642d383b37ee17;hb=faa668003ac225a7e4090f29f701727957235a24;hp=e19f317f0949faca3fcf81e37b232d23c7f06159;hpb=4e10487851e5ed9c3a6cc5f667beca5e8f1ada12;p=packages%2Fcups.git

diff --git a/cups.spec b/cups.spec
index e19f317..7d69702 100644
--- a/cups.spec
+++ b/cups.spec
@@ -1,11 +1,11 @@
+# TODO:
+# - build/install java ext ?
+# - perl BRs
 #
 # Conditional build:
 %bcond_without	php	# don't build PHP extension
 %bcond_without	perl	# don't build Perl extension
 #
-# TODO:
-# - build/install java ext ?
-# - perl BRs
 %include	/usr/lib/rpm/macros.perl
 %define		pdir CUPS
 Summary:	Common Unix Printing System
@@ -13,7 +13,7 @@ Summary(pl):	Popularny system druku dla Uniksa
 Summary(pt_BR):	Sistema Unix de Impressão
 Name:		cups
 Version:	1.2.0
-Release:	0.1
+Release:	0.8
 Epoch:		1
 License:	GPL/LGPL
 Group:		Applications/Printing
@@ -25,26 +25,22 @@ Source3:	%{name}.logrotate
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-lp-lpr.patch
 Patch2:		%{name}-options.patch
-Patch3:		%{name}-ENCRYPTIONtxt.patch
-Patch4:		%{name}-man_pages_linking.patch
-Patch5:		%{name}-nolibs.patch
-Patch6:		%{name}-nostrip.patch
-Patch7:		%{name}-rpath.patch
-Patch8:		%{name}-gcc34.patch
-Patch9:		%{name}-tmpdir.patch
-Patch10:	%{name}-gcc4.patch
-Patch11:	%{name}-CAN-2005-2097.patch
-Patch12:	%{name}-anonymous_jobs.patch
+Patch3:		%{name}-man_pages_linking.patch
+Patch4:		%{name}-nolibs.patch
+Patch5:		%{name}-nostrip.patch
+Patch6:		%{name}-rpath.patch
+Patch7:		%{name}-anonymous_jobs.patch
 URL:		http://www.cups.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dbus-devel
+BuildRequires:	openldap-devel
+BuildRequires:	openssl-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	openslp-devel
-BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 %{?with_php:BuildRequires:	php-devel >= 4:5.0.0}
 BuildRequires:	pkgconfig
@@ -239,26 +235,24 @@ pod
 
 %prep
 %setup -q
-#patch0 -p1 todo
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#patch3 -p1 obsoleted
-%patch4 -p1
-#patch5 -p1 to check
-patch6 -p1
-%patch7 -p1
-#patch8 -p1 to check
-# wtf?
-#%patch9 -p1
-#patch10 -p1 to check
-#patch11 -p1 obsoleted
-#patch12 -p1 to check
+%patch3 -p1
+#patch4 -p1 to check
+%patch5 -p1
+%patch6 -p1
+#patch7 -p1 to check
 
 %build
 %{__aclocal}
 %{__autoconf}
 %configure \
 	--libdir=%{_ulibdir} \
+	--enable-ssl \
+	--enable-openssl \
+	--disable-gnutls \
+	--disable-cdsassl \
 	--enable-dbus \
 	%{?debug:--enable-debug} \
 	--with-docdir=%{_ulibdir}/%{name}/cgi-bin
@@ -297,7 +291,6 @@ if [ "%{_lib}" != "lib" ] ; then
 fi
 
 %if %{with php}
-install -d $RPM_BUILD_ROOT%{_php_configdir}/conf.d
 %{__make} -C scripting/php install \
 	PHPDIR="%{__php_extensiondir}"
 install -d $RPM_BUILD_ROOT%{_php_configdir}/conf.d
@@ -332,12 +325,16 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{classes,printers}.conf
 # windows drivers can be put there.
 install -d $RPM_BUILD_ROOT%{_datadir}/cups/drivers
 
+touch $RPM_BUILD_ROOT/var/cache/cups/{job,remote}.cache
+install -d $RPM_BUILD_ROOT/etc/cups/ssl
+
 # post-strip can't work on readonly files
 chmod u+w $RPM_BUILD_ROOT%{perl_vendorarch}/auto/CUPS/CUPS.so
 
 # check-files cleanup
 rm -rf $RPM_BUILD_ROOT%{_mandir}/{,es/,fr/}cat?
 rm -rf $RPM_BUILD_ROOT/etc/{init.d,rc?.d}/*
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cupsd.conf.default
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -374,16 +371,16 @@ fi
 %attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/*
 %attr(754,root,root) /etc/rc.d/init.d/cups
 /etc/dbus-1/system.d/cups.conf
-%dir %{_sysconfdir}/%{name}
-%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/classes.conf
+%dir %attr(755,root,lp) %{_sysconfdir}/%{name}
+%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(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.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
-#%dir %{_sysconfdir}/%{name}/certs
+%dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl
 %dir %{_sysconfdir}/%{name}/interfaces
-%dir %{_sysconfdir}/%{name}/ppd
+%dir %attr(755,root,lp) %{_sysconfdir}/%{name}/ppd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(4755,lp,root) %{_bindir}/lppasswd
 %attr(755,root,root) %{_bindir}/cupstestppd
@@ -397,7 +394,20 @@ fi
 %exclude %{_ulibdir}/cups/backend/serial
 %exclude %{_ulibdir}/cups/backend/parallel
 %attr(755,root,root) %{_sbindir}/cupsd
-%{_datadir}/cups
+%dir %{_datadir}/cups
+%{_datadir}/cups/banners
+%{_datadir}/cups/charmaps
+%{_datadir}/cups/charsets
+%{_datadir}/cups/data
+%{_datadir}/cups/drivers
+%{_datadir}/cups/fonts
+%{_datadir}/cups/model
+%dir %{_datadir}/cups/templates
+%{_datadir}/cups/templates/*.tmpl
+%lang(es) %{_datadir}/cups/templates/es
+%lang(ja) %{_datadir}/cups/templates/ja
+%lang(pl) %{_datadir}/cups/templates/pl
+%lang(sv) %{_datadir}/cups/templates/sv
 %{_mandir}/man7/backend.7*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
@@ -430,7 +440,12 @@ fi
 #%lang(uk) %{_datadir}/locale/uk/cups_uk
 #%lang(uk) %{_datadir}/locale/uk_UA/cups_uk_UA
 #%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN
-/var/spool/cups
+%dir %attr(710,root,lp) /var/spool/cups
+%dir %attr(755,root,lp) /var/run/cups
+%dir %attr(511,lp,sys) /var/run/cups/certs
+%dir %attr(775,root,lp) /var/cache/cups
+%attr(640,root,lp) %ghost /var/cache/cups/job.cache
+%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/cups
 %attr(640,root,logs) %ghost /var/log/cups/access_log
@@ -510,7 +525,8 @@ fi
 %if %{with php}
 %files -n php-cups
 %defattr(644,root,root,755)
-%attr(755,root,root) %(_php_extensiondir)/*
+%doc scripting/php/README
+%attr(755,root,root) %{_php_extensiondir}/*
 %config(noreplace) %verify(not md5 mtime size) %{_php_configdir}/conf.d/phpcups.ini
 %endif