Author: arekm Date: Thu May 11 21:19:52 2006 GMT Module: SPECS Tag: DEVEL ---- Log message: - updated to 1.2.0 final
---- Files affected: SPECS: cups.spec (1.126.2.3 -> 1.126.2.4) ---- Diffs: ================================================================ Index: SPECS/cups.spec diff -u SPECS/cups.spec:1.126.2.3 SPECS/cups.spec:1.126.2.4 --- SPECS/cups.spec:1.126.2.3 Tue Apr 25 20:43:01 2006 +++ SPECS/cups.spec Thu May 11 23:19:47 2006 @@ -5,7 +5,6 @@ %bcond_without perl # don't build Perl extension # # TODO: -# - register php module # - build/install java ext ? # - perl BRs %include /usr/lib/rpm/macros.perl @@ -13,14 +12,13 @@ Summary(pl): Popularny system druku dla Uniksa Summary(pt_BR): Sistema Unix de Impressăo Name: cups -Version: 1.2 -%define _rc rc3 -Release: 0.%{_rc}.1 +Version: 1.2.0 +Release: 0.1 Epoch: 1 License: GPL/LGPL Group: Applications/Printing -Source0: http://ftp.easysw.com/pub/cups/%{version}%{_rc}/%{name}-%{version}%{_rc}-source.tar.bz2 -# Source0-md5: 730b77b994d1be29e5bf1f884424e9ae +Source0: http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2 +# Source0-md5: a168b0b1c8bb946060e659e1df2927c5 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate @@ -232,7 +230,7 @@ podłączonych do portów równoległych. %prep -%setup -q -n %{name}-%{version}%{_rc} +%setup -q #patch0 -p1 todo %patch1 -p1 %patch2 -p1 @@ -259,7 +257,7 @@ %{__make} %{__perl} -pi -e 's#-I\.\.\/\.\.#-I../.. -I../../cups#g' scripting/php/Makefile -%{?with_php:%{__make} -C scripting/php} +%{?with_php:%{__make} -C scripting/php PHPCONFIG=%{_bindir}/php-config} %if %{with perl} cd scripting/perl @@ -293,6 +291,11 @@ %if %{with php} %{__make} -C scripting/php install \ PHPDIR="$RPM_BUILD_ROOT`php-config --extension-dir`" +install -d $RPM_BUILD_ROOT%{_sysconfdir}/php/conf.d +cat > $RPM_BUILD_ROOT%{_sysconfdir}/php/conf.d/phpcups.ini << EOF +; Enable phpcups extension module +extension=phpcups.so +EOF %endif %if %{with perl} @@ -404,7 +407,7 @@ #%lang(he) %{_datadir}/locale/he/cups_he #%lang(it) %{_datadir}/locale/it/cups_it #%lang(ru) %{_datadir}/locale/ru_RU/cups_ru_RU -%lang(sv) %{_datadir}/locale/sv/cups_sv +%lang(sv) %{_datadir}/locale/sv/cups_sv.po #%lang(uk) %{_datadir}/locale/uk/cups_uk #%lang(uk) %{_datadir}/locale/uk_UA/cups_uk_UA #%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN @@ -489,6 +492,7 @@ %files -n php-cups %defattr(644,root,root,755) %attr(755,root,root) %(php-config --extension-dir)/* +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php/conf.d/phpcups.ini %endif %files backend-usb @@ -509,6 +513,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.126.2.4 2006/05/11 21:19:47 arekm +- updated to 1.2.0 final + Revision 1.126.2.3 2006/04/25 18:43:01 wiget - updated to 1.2rc3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.126.2.3&r2=1.126.2.4&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit