]> git.pld-linux.org Git - packages/cups.git/blobdiff - cups.spec
projects / packages / cups.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- strict internal deps, use gzip -9n
[packages/cups.git] / cups.spec
diff --git a/cups.spec b/cups.spec
index 7e42d1694c55d858dddba7a7fef027034a6f0288..3bc19d69e1126b018b90fc18be637f82b20fbbf7 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-# _without_php don't build php extension
-# _without_perl        don't build perl extension
+%bcond_without php     # don't build php extension
+%bcond_without perl    # don't build perl extension
 #
 # TODO:
 # - register php module
@@ -12,14 +12,14 @@ Summary:    Common Unix Printing System
 Summary(pl):   Popularny system druku dla Uniksa
 Summary(pt_BR):        Sistema Unix de Impressão
 Name:          cups
-%define        rcver   rc5
-Version:       1.1.20
-Release:       0.%{rcver}.3
+%define        rcver   rc1
+Version:       1.1.21
+Release:       0.%{rcver}.2
 Epoch:         1
 License:       GPL/LGPL
 Group:         Applications/Printing
-Source0:       ftp://ftp.easysw.com/pub/%{name}/%{version}%{rcver}/%{name}-%{version}%{rcver}-source.tar.bz2
-# Source0-md5: 9e0d5628465b9398fc5e1725fddf7def
+Source0:       ftp://ftp.easysw.com/pub/%{name}/test/%{name}-%{version}%{rcver}-source.tar.bz2
+# Source0-md5: 3cf609727cbf8d8c097d16100be58a28
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.logrotate
@@ -33,6 +33,8 @@ Patch6:               %{name}-man_pages_linking.patch
 Patch7:                %{name}-nolibs.patch
 Patch8:                %{name}-chown.patch
 Patch9:                %{name}-nostrip.patch
+Patch10:       %{name}-rpath.patch
+Patch11:       %{name}-gcc34.patch
 URL:           http://www.cups.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -40,12 +42,12 @@ BuildRequires:      libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: openslp-devel
-BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
-%{?!_without_php:BuildRequires:        php-devel}
+%{?with_php:BuildRequires:     php-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov
-PreReq:                %{name}-libs = %{epoch}:%{version}
+PreReq:                %{name}-libs = %{epoch}:%{version}-%{release}
 Requires(post,preun):  /sbin/chkconfig
 Requires:      pam >= 0.77.3
 Conflicts:     ghostscript < 7.05.4
@@ -53,6 +55,8 @@ Obsoletes:    lpr
 Obsoletes:     LPRng
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _ulibdir        %{_prefix}/lib
+
 %description
 CUPS provides a portable printing layer for UNIX®-based operating
 systems. It has been developed by Easy Software Products to promote a
@@ -127,8 +131,8 @@ Summary:    Common Unix Printing System development files
 Summary(pl):   Popularny System Druku dla Uniksa, pliki nag³ówkowe
 Summary(pt_BR):        Sistema Unix de Impressão - ambiente de desenvolvimento
 Group:         Development/Libraries
-Requires:      %{name}-image-lib = %{epoch}:%{version}
-Requires:      %{name}-lib = %{epoch}:%{version}
+Requires:      %{name}-image-lib = %{epoch}:%{version}-%{release}
+Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Obsoletes:     libcups1-devel
 
 %description devel
@@ -147,7 +151,7 @@ Summary:    Common Unix Printing System static libraries
 Summary(pl):   Popularny System Druku dla Uniksa, biblioteki statyczne
 Summary(pt_BR):        Common Unix Printing System - bibliotecas estáticas
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Common Unix Printing System static libraries.
@@ -163,7 +167,7 @@ bibliotecas do CUPS.
 Summary:       Perl module for CUPS
 Summary(pl):   Modu³ Perla CUPS
 Group:         Development/Languages/Perl
-Requires:      cups-lib = %{epoch}:%{version}
+Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 
 %description -n perl-cups
 Perl module for Common Unix Printing System.
@@ -175,7 +179,7 @@ Modu
 Summary:       PHP module for CUPS
 Summary(pl):   Modu³ PHP CUPS
 Group:         Development/Languages/PHP
-Requires:      cups-lib = %{epoch}:%{version}
+Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 
 %description -n php-cups
 PHP module for Common Unix Printing System.
@@ -187,7 +191,7 @@ Modu
 Summary:       USB backend for CUPS
 Summary(pl):   Backend USB dla CUPS-a
 Group:         Applications/Printing
-Requires:      cups = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description backend-usb
 This package allow CUPS printing on USB printers.
@@ -199,7 +203,7 @@ Ten pakiet umo
 Summary:       Serial port backend for CUPS
 Summary(pl):   Backend obs³uguj±cy porty szeregowe dla CUPS-a
 Group:         Applications/Printing
-Requires:      cups = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description backend-serial
 This package allow CUPS printing on printers connected by serial
@@ -213,7 +217,7 @@ pod
 Summary:       Parallel port backend for CUPS
 Summary(pl):   Backend obs³uguj±cy porty równoleg³e dla CUPS-a
 Group:         Applications/Printing
-Requires:      cups = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description backend-parallel
 This package allow CUPS printing on printers connected by parallel
@@ -236,18 +240,21 @@ pod
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %configure \
-       --with-docdir=%{_libdir}/%{name}/cgi-bin
+       --libdir=%{_ulibdir} \
+       --with-docdir=%{_ulibdir}/%{name}/cgi-bin
 %{__make}
 
 perl -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile
-%{?!_without_php:%{__make} -C scripting/php}
+%{?with_php:%{__make} -C scripting/php}
 
-%if 0%{?!_without_perl:1}
+%if %{with perl}
 cd scripting/perl
 %{__perl} -pi -e 's@-lcups@-L../../cups $1@' Makefile.PL
 %{__perl} Makefile.PL \
@@ -262,35 +269,43 @@ cd ../..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{{rc.d/init.d,pam.d,logrotate.d},security} \
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/{{rc.d/init.d,pam.d,logrotate.d},security} \
        $RPM_BUILD_ROOT/var/log/{,archiv/}cups
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%if 0%{?!_without_php:1}
+if [ "%{_lib}" != "lib" ] ; then
+       install -d $RPM_BUILD_ROOT%{_libdir}
+       mv $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
+       mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
+fi
+
+%if %{with php}
 %{__make} -C scripting/php install \
        PHPDIR="$RPM_BUILD_ROOT`php-config --extension-dir`"
 %endif
 
-%if 0%{?!_without_perl:1}
+%if %{with perl}
 cd scripting/perl
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 cd ../..
 %endif
 
-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 %{SOURCE1}     $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/%{name}
+install %{SOURCE2}     $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/%{name}
+install %{SOURCE3}     $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}
+
+gzip -9nf $RPM_BUILD_ROOT/%{_datadir}/%{name}/model/*.ppd
 
 # for internal http browser:
-cp doc/*.html  $RPM_BUILD_ROOT%{_libdir}/%{name}/cgi-bin
-cp doc/*.css   $RPM_BUILD_ROOT%{_libdir}/%{name}/cgi-bin
-cp doc/images/*        $RPM_BUILD_ROOT%{_libdir}/%{name}/cgi-bin/images
+cp doc/*.html  $RPM_BUILD_ROOT%{_ulibdir}/%{name}/cgi-bin
+cp doc/*.css   $RPM_BUILD_ROOT%{_ulibdir}/%{name}/cgi-bin
+cp doc/images/*        $RPM_BUILD_ROOT%{_ulibdir}/%{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
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/security/blacklist.cups
 
 # check-files cleanup
 rm -rf $RPM_BUILD_ROOT%{_mandir}/{,fr/}cat?
@@ -300,7 +315,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add cups
-if [ -f /var/lock/subsys/cupsd ]; then
+if [ -f /var/lock/subsys/cups ]; then
        /etc/rc.d/init.d/cups restart 1>&2
 else
        echo "Run \"/etc/rc.d/init.d/cups start\" to start cups daemon."
@@ -308,7 +323,7 @@ fi
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/cupsd ]; then
+       if [ -f /var/lock/subsys/cups ]; then
                /etc/rc.d/init.d/cups stop 1>&2
        fi
        /sbin/chkconfig --del cups
@@ -340,12 +355,12 @@ fi
 %attr(755,root,root) %{_bindir}/cupstestppd
 %attr(755,root,root) %{_bindir}/disable
 %attr(755,root,root) %{_bindir}/enable
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/*
-%attr(755,root,root) %{_libdir}/cups/*/*
-%exclude %{_libdir}/cups/backend/usb
-%exclude %{_libdir}/cups/backend/serial
-%exclude %{_libdir}/cups/backend/parallel
+%dir %{_ulibdir}/cups
+%dir %{_ulibdir}/cups/*
+%attr(755,root,root) %{_ulibdir}/cups/*/*
+%exclude %{_ulibdir}/cups/backend/usb
+%exclude %{_ulibdir}/cups/backend/serial
+%exclude %{_ulibdir}/cups/backend/parallel
 %attr(755,root,root) %{_sbindir}/cupsd
 %{_datadir}/cups
 %{_mandir}/man1/backend.1*
@@ -425,14 +440,15 @@ fi
 %attr(755,root,root) %{_bindir}/cups-config
 %{_includedir}/cups
 %{_libdir}/lib*.so
+%{_mandir}/man1/cups-config*
 %{_mandir}/man3/*
-%lang(fr) %{_mandir}/fr/man3/*
+%lang(fr) %{_mandir}/fr/man1/cups-config*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/*.a
 
-%if 0%{?!_without_perl:1}
+%if %{with perl}
 %files -n perl-cups
 %defattr(644,root,root,755)
 %{perl_vendorarch}/*.pm
@@ -442,7 +458,7 @@ fi
 %attr(755,root,root) %{perl_vendorarch}/auto/CUPS/*.so
 %endif
 
-%if 0%{?!_without_php:1}
+%if %{with php}
 %files -n php-cups
 %defattr(644,root,root,755)
 %attr(755,root,root) %(php-config --extension-dir)/*
@@ -450,12 +466,12 @@ fi
 
 %files backend-usb
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/cups/backend/usb
+%attr(755,root,root) %{_ulibdir}/cups/backend/usb
 
 %files backend-serial
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/cups/backend/serial
+%attr(755,root,root) %{_ulibdir}/cups/backend/serial
 
 %files backend-parallel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/cups/backend/parallel
+%attr(755,root,root) %{_ulibdir}/cups/backend/parallel
USB backend for CUPS
This page took 0.14468 seconds and 4 git commands to generate.