- preffer openssl over gnutls/cdsassl; br: openldap-devel

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index 8a81168cc01f11203d5bdf6a1829ff176a043674..7d69702a9ead20ba6a99734f64642d383b37ee17 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -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.7
+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
+%patch3 -p1
+#patch4 -p1 to check
+%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-#patch8 -p1 to check
-# wtf?
-#%patch9 -p1
-#patch10 -p1 to check
-#patch11 -p1 obsoleted
-#patch12 -p1 to check
+#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
@@ -531,6 +525,7 @@ fi
 %if %{with php}
 %files -n php-cups
 %defattr(644,root,root,755)
+%doc scripting/php/README
 %attr(755,root,root) %{_php_extensiondir}/*
 %config(noreplace) %verify(not md5 mtime size) %{_php_configdir}/conf.d/phpcups.ini
 %endif