Author: sls Date: Fri Nov 16 07:26:45 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - removed broken cups bcond - verbose py_sitedir files
---- Files affected: SPECS: hplip.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/hplip.spec diff -u SPECS/hplip.spec:1.40 SPECS/hplip.spec:1.41 --- SPECS/hplip.spec:1.40 Fri Nov 16 07:33:09 2007 +++ SPECS/hplip.spec Fri Nov 16 08:26:40 2007 @@ -18,7 +18,6 @@ # - hpaio.desc removed in Fedora # # Conditional build: -%bcond_without cups # without CUPS support # Summary: Hewlett-Packard Linux Imaging and Printing Project Summary(pl.UTF-8): Serwer dla drukarek HP Inkjet @@ -32,7 +31,7 @@ URL: http://hplip.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake -%{?with_cups:BuildRequires: cups-devel} +BuildRequires: cups-devel BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel BuildRequires: libusb-devel @@ -54,10 +53,8 @@ %define _ulibdir %{_prefix}/lib -%if %{with cups} %define _cupsdir %(cups-config --datadir) %define _cupsppddir %{_cupsdir}/model -%endif %description The Hewlett-Packard Linux Imaging and Printing project (HPLIP) @@ -154,8 +151,7 @@ CXXFLAGS="%{rpmcflags} -fno-exceptions -fno-rtti" %configure \ --disable-foomatic-xml-install \ - --enable-foomatic-ppd-install \ - %{!?with_cups:--disable-cups-install} + --enable-foomatic-ppd-install %{__make} \ hpppddir=/usr/share/cups/model \ hpppddir=%{_cupsppddir} @@ -163,10 +159,8 @@ %install rm -rf $RPM_BUILD_ROOT -%if %{with cups} install -d $RPM_BUILD_ROOT$(cups-config --datadir)/model \ $RPM_BUILD_ROOT$(cups-config --serverbin)/filter -%endif %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -258,7 +252,10 @@ %{_datadir}/hplip/prnt %{_datadir}/hplip/scan %{_datadir}/hplip/ui -%attr(755,root,root) %{py_sitedir}/*.so +%attr(755,root,root) %{py_sitedir}/cupsext.so +%attr(755,root,root) %{py_sitedir}/hpmudext.so +%attr(755,root,root) %{py_sitedir}/pcardext.so +%attr(755,root,root) %{py_sitedir}/scanext.so %dir %{_sysconfdir}/hp %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hp/* @@ -281,7 +278,6 @@ %attr(755,root,root) %{_libdir}/sane/libsane*.so.* %{_datadir}/hplip/hpaio.desc -%if %{with cups} %files ppd %defattr(644,root,root,755) %{_cupsppddir}/* @@ -293,7 +289,6 @@ %files -n cups-backend-hpfax %defattr(644,root,root,755) %attr(755,root,root) %{_ulibdir}/cups/backend/hpfax -%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -301,6 +296,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.41 2007-11-16 07:26:40 sls +- removed broken cups bcond +- verbose py_sitedir files + Revision 1.40 2007-11-16 06:33:09 sls - cleanup ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/hplip.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
