- fixed perl module build w/o cups-lib already installed

Changed files:
    cups.spec -> 1.69

diff --git a/cups.spec b/cups.spec
index 5600e5712e3b9292037b72128e60a0064b43e834..d4f700650a0dca677ba63b30eab4a179937e89ae 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,12 +1,15 @@
-# Conditionals:
+#
+# Conditional build:
 # _without_php don't build php extension
 # _without_perl        don't build perl extension
+#
 # TODO:
 # - register php module
 # - build/install java ext ?
 # - perl BRs
+%include       /usr/lib/rpm/macros.perl
 Summary:       Common Unix Printing System
-Summary(pl):   Popularny System Druku dla Unixa
+Summary(pl):   Popularny System Druku dla Uniksa
 Summary(pt_BR):        Sistema Unix de Impressão
 Name:          cups
 Version:       1.1.19
@@ -115,7 +118,7 @@ Bibliotecas CUPS requeridas pelos clientes CUPS.
 
 %package devel
 Summary:       Common Unix Printing System development files
-Summary(pl):   Popularny System Druku dla Unixa, pliki nag³ówkowe
+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}-lib = %{version}
@@ -126,7 +129,7 @@ Obsoletes:  libcups1-devel
 Common Unix Printing System development files.
 
 %description devel -l pl
-Popularny System Druku dla Unixa, pliki nag³ówkowe.
+Popularny System Druku dla Uniksa, pliki nag³ówkowe.
 
 %description devel -l pt_BR
 Este pacote é um adicional que contem um ambiente de desenvolvimento
@@ -135,7 +138,7 @@ CUPS.
 
 %package static
 Summary:       Common Unix Printing System static libraries
-Summary(pl):   Popularny System Druku dla Unixa, biblioteki statyczne
+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 = %{version}
@@ -144,28 +147,36 @@ Requires: %{name}-devel = %{version}
 Common Unix Printing System static libraries.
 
 %description static -l pl
-Popularny System Druku dla Unixa, biblioteki statyczne.
+Popularny System Druku dla Uniksa, biblioteki statyczne.
 
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento de programas que usam as
 bibliotecas do CUPS.
 
 %package -n perl-cups
-Summary:       perl module for CUPS
-Group:         ?
+Summary:       Perl module for CUPS
+Summary(pl):   Modu³ Perla CUPS
+Group:         Development/Languages/Perl
 Requires:      cups-lib = %{version}
 
 %description -n perl-cups
-perl module for Common Unix Printing System.
+Perl module for Common Unix Printing System.
+
+%description -n perl-cups -l pl
+Modu³ Perla do Popularnego Systemu Druku dla Uniksa.
 
 %package -n php-cups
 Summary:       PHP module for CUPS
-Group:         ?
+Summary(pl):   Modu³ PHP CUPS
+Group:         Development/Languages/PHP
 Requires:      cups-lib = %{version}
 
 %description -n php-cups
 PHP module for Common Unix Printing System.
 
+%description -n php-cups -l pl
+Modu³ PHP do Popularnego Systemu Druku dla Uniksa.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -184,11 +195,19 @@ PHP module for Common Unix Printing System.
 %configure \
        --with-docdir=%{_libdir}/%{name}/cgi-bin
 %{__make}
+
 %{?!_without_php:%{__make} -C scripting/php}
+
 %if 0%{?!_without_perl:1}
 cd scripting/perl
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} OPTIMIZE="%{rpmcflags}"
+%{__perl} -pi -e 's@-lcups@-L../../cups $1@' Makefile.PL
+%{__perl} Makefile.PL \
+       INSTALLDIRS=vendor \
+       OPTIMIZE="%{rpmcflags} -I../.."
+# avoid rpaths generated by MakeMaker
+perl -pi -e 's@LD_RUN_PATH="\$\(LD_RUN_PATH\)" @@' Makefile
+
+%{__make}
 cd ../..
 %endif