- added nolibs patch to remove unnecessary -lnsl; release 3

[packages/cups.git] / cups.spec

diff --git a/cups.spec b/cups.spec
index 2efbf8653fb0b50ae722e4278dd03dd1055c2e44..4c78d53887274a2df87c549f8ef77a326a481c54 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -3,7 +3,7 @@ Summary(pl):    Popularny System Druku dla Unixa
 Summary(pt_BR):        Sistema Unix de Impressão
 Name:          cups
 Version:       1.1.18
-Release:       1
+Release:       3
 Epoch:         1
 License:       GPL/LGPL
 Group:         Applications/Printing
@@ -17,17 +17,19 @@ Patch2:             %{name}-tmpdir.patch
 Patch3:                %{name}-lp-lpr.patch
 Patch4:                %{name}-options.patch
 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
 BuildRequires: pkgconfig
-Prereq:                %{name}-libs = %{version}
-Prereq:                /sbin/chkconfig
+PreReq:                %{name}-libs = %{version}
+PreReq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     lpr
 Obsoletes:     LPRng
@@ -57,7 +59,7 @@ 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:         Libraries
 Provides:      %{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:     %{name}-libs
 Obsoletes:     libcups1
@@ -88,7 +90,7 @@ Aplikacje klienckie dla CUPS.
 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:         Libraries
 Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Obsoletes:     libcups1
 
@@ -147,6 +149,8 @@ bibliotecas do CUPS.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__aclocal}
@@ -182,9 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add cups
 if [ -f /var/lock/subsys/cupsd ]; then
-        /etc/rc.d/init.d/cups restart 1>&2
+       /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
@@ -222,7 +226,7 @@ fi
 %attr(755,root,root) %{_bindir}/enable
 %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}/man1/backend.1*
@@ -270,12 +274,14 @@ fi
 %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*