Author: glen                         Date: Wed May 26 10:32:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.1.0

---- Files affected:
packages/php-htmlpurifier:
   php-htmlpurifier.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/php-htmlpurifier/php-htmlpurifier.spec
diff -u packages/php-htmlpurifier/php-htmlpurifier.spec:1.6 
packages/php-htmlpurifier/php-htmlpurifier.spec:1.7
--- packages/php-htmlpurifier/php-htmlpurifier.spec:1.6 Sun May 16 16:13:57 2010
+++ packages/php-htmlpurifier/php-htmlpurifier.spec     Wed May 26 12:31:59 2010
@@ -1,24 +1,42 @@
 # $Revision$, $Date$
+# TODO
+# - phorum-mod-htmlpurifier package: plugins/phorum
+# - apidocs package: docs
+# - run tests
+%include       /usr/lib/rpm/macros.php
+%define                php_min_version 5.1.2
 Summary:       Standards-compliant HTML filter library written in PHP
 Summary(pl.UTF-8):     Zgodna ze standardami biblioteka filtrujÄ…ca HTML 
napisana w PHP
-Name:          htmlpurifier
-Version:       2.1.5
+Name:          php-htmlpurifier
+Version:       4.1.0
 Release:       1
 License:       LGPL v2.1
 Group:         Development/Languages/PHP
-Source0:       http://htmlpurifier.org/releases/%{name}-%{version}.zip
-# Source0-md5: 129939e86c0afbec6d0bc87f5dcd6adc
-URL:           http://htmlpurifier.org/
-BuildRequires: rpmbuild(macros) >= 1.268
+Source0:       http://htmlpurifier.org/releases/htmlpurifier-%{version}.tar.gz
+# Source0-md5: d8a4388a7fe475db6a625f0c1b30bcae
+URL:           http://www.htmlpurifier.org/
+BuildRequires: rpmbuild(macros) >= 1.553
 BuildRequires: sed >= 4.0
 BuildRequires: unzip
-Requires:      php-common >= 3:4.3.2
-Suggests:      php(iconv)
-Suggests:      php(tidy)
+Requires:      php-common >= 4:%{php_min_version}
+Requires:      php-ctype
+Requires:      php-dom
+Requires:      php-pcre
+Requires:      php-spl
+Requires:      php-xml
+Suggests:      php-iconv
+Suggests:      php-tidy
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _phpdir         %{_datadir}/php
+# bad depsolver
+%define                _noautopear     pear
+
+# exclude optional php dependencies
+%define                _noautophp      php-curl
+
+# put it together for rpmbuild
+%define                _noautoreq      %{?_noautophp} %{?_noautopear}
 
 %description
 HTML Purifier is a standards-compliant HTML filter library written in
@@ -37,14 +55,14 @@
 specyfikacji W3C.
 
 %prep
-%setup -q
-%{__sed} -i -e 's,\r$,,' CREDITS INSTALL README TODO WHATSNEW WYSIWYG
-find -name '*.php' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+%setup -qn htmlpurifier-%{version}
+find -name '*.php' -print0 | xargs -0 %undos
+mv INSTALL.fr{.utf8,}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_phpdir}
-cp -a library/* $RPM_BUILD_ROOT%{_phpdir}
+install -d $RPM_BUILD_ROOT%{php_data_dir}
+cp -a library/* $RPM_BUILD_ROOT%{php_data_dir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,7 +70,9 @@
 %files
 %defattr(644,root,root,755)
 %doc CREDITS INSTALL README TODO WHATSNEW WYSIWYG
-%{_phpdir}/*
+%doc FOCUS NEWS VERSION WHATSNEW
+%doc %lang(fr) INSTALL.fr
+%{php_data_dir}/*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -60,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/05/26 10:31:59  glen
+- up to 4.1.0
+
 Revision 1.6  2010/05/16 14:13:57  sparky
 - BR: unzip
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-htmlpurifier/php-htmlpurifier.spec?r1=1.6&r2=1.7&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to