X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=packaging%2Fcups.spec.in;h=aaa63561ea9294eb98aa1cb9872b4fe14d2f237b;hp=2516be253624db1253d61a6462e14e7db8e422be;hb=e1d6a77454308ff30d6da778be9d7b570e4f00b0;hpb=480ef0fe29ab803f49dd87a7a21a6c61648539b8

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 2516be253..aaa63561e 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec.in 5224 2006-03-04 02:00:43Z mike $"
+# "$Id: cups.spec.in 5310 2006-03-19 03:23:34Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -34,6 +34,8 @@
 %{!?_with_dbus: %define _dbus --disable-dbus}
 
 %{!?_with_php: %{!?_without_php: %define _with_php --with-php}}
+%{?_with_php: %define _php --with-php}
+%{!?_with_php: %define _php --without-php}
 
 Summary: Common UNIX Printing System
 Name: cups
@@ -70,6 +72,11 @@ Summary: Common UNIX Printing System - LPD support
 Group: System Environment/Daemons
 Requires: %{name} = %{epoch}:%{version} xinetd
 
+%package es
+Summary: Common UNIX Printing System - Spanish support
+Group: System Environment/Daemons
+Requires: %{name} = %{epoch}:%{version}
+
 %package ja
 Summary: Common UNIX Printing System - Japanese support
 Group: System Environment/Daemons
@@ -101,6 +108,10 @@ UNIX
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX® operating systems. This package provides LPD client support.
 
+%description es
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX® operating systems. This package provides Spanish support.
+
 %description ja
 The Common UNIX Printing System provides a portable printing layer for 
 UNIX® operating systems. This package provides Japanese support.
@@ -115,8 +126,12 @@ UNIX
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" ./configure %{_dbus} %{_without_php}
-
+%ifarch x86_64
+./configure --enable-32bit %{_dbus} %{_php}
+%else
+CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
+    ./configure %{_dbus} %{_php}
+%endif
 # If we got this far, all prerequisite libraries must be here.
 make
 
@@ -281,6 +296,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0710,lp,sys) %dir /var/spool/cups
 %attr(1770,lp,sys) %dir /var/spool/cups/tmp
 
+# Desktop files
+/usr/share/applications/*
+/usr/share/icons/*
+
 %files devel
 %defattr(-,root,root)
 %dir /usr/share/man/man1
@@ -292,7 +311,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/include/cups
 /usr/include/cups/*
 #/usr/lib/*.a
-/usr/lib/*.so
+/usr/lib*/*.so
 
 %dir /usr/share/doc/cups/help
 /usr/share/doc/cups/help/api*.html
@@ -300,17 +319,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root)
-/usr/lib/*.so.*
+/usr/lib*/*.so.*
 
 %files lpd
 %defattr(-,root,root)
-#/etc/xinetd.d/cups-lpd
+/etc/xinetd.d/cups-lpd
 %dir /usr/lib/cups
 %dir /usr/lib/cups/daemon
 /usr/lib/cups/daemon/cups-lpd
 %dir /usr/share/man/man8
 /usr/share/man/man8/cups-lpd.8.gz
 
+%files es
+%defattr(-,root,root)
+%dir /usr/share/doc/cups/es
+/usr/share/doc/cups/es/index.html
+%dir /usr/share/doc/cups/es/images
+/usr/share/doc/cups/es/images/*
+%dir /usr/share/cups/templates/es
+/usr/share/cups/templates/es/*
+/usr/share/locale/es/cups_es.po
+
 %files ja
 %defattr(-,root,root)
 %dir /usr/share/doc/cups/ja
@@ -324,10 +353,10 @@ rm -rf $RPM_BUILD_ROOT
 %if %{?_with_php:1}%{!?_with_php:0}
 %files php
 # PHP
-/usr/lib/php*
+/usr/lib*/php*
 %endif
 
 
 #
-# End of "$Id: cups.spec.in 5224 2006-03-04 02:00:43Z mike $".
+# End of "$Id: cups.spec.in 5310 2006-03-19 03:23:34Z mike $".
 #