summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-02-04 04:27:58 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-02-04 04:27:58 +0000
commit745129beebf8651dd9ce221cc7c046460b4ae8f6 (patch)
tree36a3744f51208f5de35489ce45064f90499a450e /packaging
parentdfd5680b8770f4dd462a90a7a6579aa9523e484f (diff)
downloadcups-745129beebf8651dd9ce221cc7c046460b4ae8f6.tar.gz
Merge changes from CUPS 1.4svn-r8329.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1182 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'packaging')
-rw-r--r--packaging/cups.spec.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 9dd388583..c76655c67 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -107,12 +107,8 @@ UNIX® operating systems. This package provides PHP support.
%setup
%build
-%ifarch x86_64
-./configure --enable-32bit %{_dbus} %{_php} %{_static}
-%else
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" \
./configure %{_dbus} %{_php} %{_static}
-%endif
# If we got this far, all prerequisite libraries must be here.
make
@@ -246,6 +242,8 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/cups/templates/*
%dir /usr/share/doc/cups
/usr/share/doc/cups/*.*
+%dir /usr/share/doc/cups/es
+/usr/share/doc/cups/es/*
%dir /usr/share/doc/cups/help
/usr/share/doc/cups/help/accounting.html
/usr/share/doc/cups/help/cgi.html