packages: wordpress/wordpress.spec, wordpress/rss-functions.php (REMOVED), ...
glen
glen at pld-linux.org
Wed Sep 8 23:12:12 CEST 2010
Author: glen Date: Wed Sep 8 21:12:12 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use system simplepie class
- move wp-admin to base package
---- Files affected:
packages/wordpress:
wordpress.spec (1.67 -> 1.68) , rss-functions.php (1.1 -> NONE) (REMOVED), rss.php (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/wordpress/wordpress.spec
diff -u packages/wordpress/wordpress.spec:1.67 packages/wordpress/wordpress.spec:1.68
--- packages/wordpress/wordpress.spec:1.67 Wed Sep 8 17:45:28 2010
+++ packages/wordpress/wordpress.spec Wed Sep 8 23:12:06 2010
@@ -6,7 +6,7 @@
Summary(pl.UTF-8): Osobisty system publikacji
Name: wordpress
Version: 3.0.1
-Release: 0.8
+Release: 0.10
License: GPL v2
Group: Applications/Publishing
Source0: http://wordpress.org/%{name}-%{version}.tar.gz
@@ -20,18 +20,17 @@
# Source6-md5: 7ee698806091573a534a4889f88d6d97
Source7: http://svn.automattic.com/wordpress-i18n/pl_PL/tags/%{version}/messages/pl_PL.po
# Source7-md5: 795864c6eeeadcc74b8ea70d45f22e9f
-# MagpieRSS upgrade (version 0.8a) from feedwordpress plugin: http://feedwordpress.radgeek.com/
-Source10: rss.php
-Source11: rss-functions.php
Patch0: configpath.patch
Patch1: multisite.patch
Patch2: %{name}.patch
+Patch3: simplepie.patch
URL: http://www.wordpress.org/
BuildRequires: gettext-devel
BuildRequires: rpmbuild(macros) >= 1.553
Requires: php-gettext
Requires: php-mysql
Requires: php-pcre
+Requires: php-simplepie >= 1.2
Requires: php-xml
Requires: php-xmlrpc
Requires: webapps
@@ -39,6 +38,14 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# no pear deps
+%define _noautopear pear
+
+%define _noautophp php-simplexml
+
+# put it together for rpmbuild
+%define _noautoreq %{?_noautophp} %{?_noautopear}
+
%define _appdir %{_datadir}/%{name}
%define _webapps /etc/webapps
%define _webapp %{name}
@@ -125,10 +132,8 @@
# sample plugin
rm wp-content/plugins/hello.php
-# Install new MagpieRSS
-# NOTE: this is deprecated, simplepie should be used instead
-cp -a %{SOURCE10} wp-includes/rss.php
-cp -a %{SOURCE11} wp-includes/rss-functions.php
+# system simplepie
+rm wp-includes/class-simplepie.php
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -218,6 +223,9 @@
%dir %{_appdir}/wp-content/mu-plugins
%dir %{_appdir}/wp-content/themes
+# needed for daily moderation
+%{_appdir}/wp-admin
+
%attr(775,root,http) /var/lib/%{name}
%attr(775,root,http) /var/log/%{name}
@@ -227,7 +235,6 @@
%attr(755,root,root) %{_bindir}/wp-setup
%{_appdir}/wp-secure.sh
%{_appdir}/wp-setup.sh
-%{_appdir}/wp-admin
%files plugin-akismet
%defattr(644,root,root,755)
@@ -246,6 +253,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.68 2010/09/08 21:12:06 glen
+- use system simplepie class
+- move wp-admin to base package
+
Revision 1.67 2010/09/08 15:45:28 glen
- relocate blogs.dir to /var/lib/wordpress
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wordpress/wordpress.spec?r1=1.67&r2=1.68&f=u
More information about the pld-cvs-commit
mailing list