[wordpress/el5] New upstream release.

Matej Cepl mcepl at fedoraproject.org
Wed Dec 12 14:06:18 UTC 2012


commit fe89485815c6df7dd631602cdd08707151513f02
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Dec 12 15:05:38 2012 +0100

    New upstream release.

 .gitignore     |    2 +-
 sources        |    2 +-
 wordpress.spec |  112 ++++++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 94 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4c188a..4f114c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/wordpress-3.4.2.tar.gz
+/wordpress-3.5.tar.gz
diff --git a/sources b/sources
index 4697198..3744939 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfc56cee27eec8fb79070f033ecd4b25  wordpress-3.4.2.tar.gz
+105b5baff67344528bb5d8b71c050b0d  wordpress-3.5.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index 04bf393..5750940 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,15 +1,16 @@
 %global wp_content %{_datadir}/wordpress/wp-content
-#%#global betatag -RC3
+%global betatag RC3
 
 Summary: Blog tool and publishing platform
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 3.4.2
+Version: 3.5
 Group: Applications/Publishing
-#Release: 0.2.%{betatag}%{?dist}
-Release: 3%{?dist}
+#Release: 0.5.%{betatag}%{?dist}
+Release: 1%{?dist}
 License: GPLv2
-Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz
+#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz
+Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
 Source3: README.fedora.wordpress-mu
@@ -17,13 +18,43 @@ Source3: README.fedora.wordpress-mu
 # (and replace it with Free Software Song)
 Patch0: wordpress-debian_patches_hello.patch
 # Move wp-content to /var/www/wordpress/
+# This patch doesn’t work well, see bugzilla.redhat.com/522897
 Patch1: wordpress-move-wp-content.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{?rhel} == 5
-Requires: php53 >= 5.2.4, php53-mysql, php53-simplepie
+Requires: php53 >= 5.2.4, php53-simplepie
 %else
-Requires: php >= 5.2.4, php-mysql, php-simplepie
+Requires: php >= 5.2.4, php-simplepie
 %endif
+# Required php extension (detected by phpci)
+Requires: php-curl
+Requires: php-date
+Requires: php-dom
+Requires: php-enchant
+# not yet available for RHEL Requires: php-ereg
+Requires: php-exif
+Requires: php-fileinfo
+# not yet available for RHEL Requires: php-filter
+Requires: php-gettext
+Requires: php-hash
+Requires: php-iconv
+Requires: php-json
+Requires: php-libxml
+Requires: php-mbstring
+Requires: php-mysql
+Requires: php-openssl
+Requires: php-pcre
+Requires: php-pdo
+Requires: php-posix
+Requires: php-reflection
+Requires: php-simplexml
+Requires: php-sockets
+Requires: php-spl
+Requires: php-tokenizer
+Requires: php-zip
+Requires: php-zlib
+# Unbundled libraries
+Requires: php-PHPMailer
 Requires: webserver
 Provides: wordpress-mu = %{version}-%{release}
 Obsoletes: wordpress-mu < 2.9.3
@@ -70,13 +101,14 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \;
 # These are docs, remove them from here, docify them later
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html}
 
-# Remove bundled php-gettext and link to system copy
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/gettext.php
-
 # Remove bundled php-simplepie and link to system copy
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
 ln -sf /usr/share/php/php-simplepie/simplepie.inc ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php
 
+# Remove bundled PHPMailer and link to system one
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-{phpmailer,smtp,pop3}.php
+ln -sf /usr/share/php/PHPMailer/*php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/
+
 # Remove backup copies of patches
 find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \
     -print -delete
@@ -122,6 +154,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Wed Dec 12 2012 Matěj Cepl <mcepl at redhat.com> - 3.5-1
+- New upstream release.
+
+* Mon Oct 29 2012 Remi Collet <rcollet at redhat.com> - 3.5-0.3.beta2
+- use system PHPMailer
+- requires needed php extensions
+
 * Thu Sep 06 2012 Matej Cepl <mcepl at redhat.com> - 3.4.2-2
 - Upstream security update.
 
@@ -137,22 +176,52 @@ rm -rf ${RPM_BUILD_ROOT}
   * theme customizer
   * XML-RPC themes and API improvements
 
-* Mon Apr 23 2012 'Matěj Cepl <mcepl at redhat.com>' - 3.3.2-2
-- Security updates for uploading files.
-  * Fixed CVE-2011-0700: two XSS bug. Affects users of the Author
-    or Contributor role.
-  * Fixed CVE-2011-0701: potential information disclosure of
-    posts through the media uploader.
+* Tue Jun 12 2012 Matej Cepl <mcepl at redhat.com> - 3.4-0.2.RC3
+- They still haven’t released.
+
+* Thu Jun 07 2012 Matej Cepl <mcepl at redhat.com> - 3.4-0.2.RC2
+- And yet another release candidate.
+
+* Wed May 30 2012 Matej Cepl <mcepl at redhat.com> - 3.4-0.2.RC1
+- We have a release candidate now.
+
+* Thu May 03 2012 'Matej Cepl <mcepl at redhat.com>' - 3.4-0.2.beta4
+- New week, new upstream beta. Less drama than last time.
+
+* Mon Apr 23 2012 'Matěj Cepl <mcepl at redhat.com>' - 3.4-0.2.beta3
+- And yet another upstream beta (fixes CVE-2011-0700 and
+  CVE-2011-0701)
 
-* Wed Jan 04 2012 'Matěj Cepl <mcepl at redhat.com>' - 3.3.1-1
+* Mon Apr 16 2012 Matěj Cepl <mcepl at redhat.com> - 3.4-0.2.beta2
+- And yet another upstream beta
+
+* Thu Apr 05 2012 'Matej Cepl <mcepl at redhat.com>' - 3.4-0.1.beta1
+- New upstream beta release (just for Rawhide, to be sure we build)
+
+* Wed Jan 04 2012 'Matej Cepl <mcepl at redhat.com>' - 3.3.1-1
 - Security (XSS) and maintenance upstream release.
 
 * Tue Dec 13 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-1
 - New upstream release.
 
-* Fri Nov 11 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.2.1-2.1
+* Wed Dec 07 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.5.RC2
+- ... and one day after I upgraded to RC1, we have new RC2 ;)
+
+* Tue Dec 06 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.4.RC1
+- Cool we are on RC1!
+
+* Thu Nov 24 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.3.beta4
+- Another upstream beta release (now hopefully, really close to RC)
+
+* Fri Nov 11 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.3.beta3
 - Fix version requirement for php (Closes #753192)
 
+* Wed Nov 09 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.2.beta3
+- Another upstream beta release.
+
+* Thu Oct 20 2011 'Matěj Cepl <mcepl at redhat.com>' - 3.3-0.1.beta2
+- New upstream beta release (just for Rawhide, to be sure we build)
+
 * Sat Jul 30 2011 Matěj Cepl <mcepl at redhat.com> - 3.2.1-2
 - Rebuilt against new libraries.
 
@@ -162,8 +231,11 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue Jul 05 2011 Matěj Cepl <mcepl at redhat.com> - 3.2-1
 - New upstream release.
 
-* Wed Jun 29 2011 Matěj Cepl <mcepl at redhat.com> - 3.1.4-1
-- New upstream security release.
+* Wed Jun 29 2011 Matěj Cepl <mcepl at redhat.com> - 3.2-0.1.RC3
+- Updated prerelease version (security and minor fixes).
+
+* Sun Jun 19 2011 Matěj Cepl <mcepl at redhat.com> - 3.2-0.1.RC1
+- Prerelease version.
 
 * Thu Jun 02 2011 Matěj Cepl <mcepl at redhat.com> - 3.1.3-3
 - Actually, we just don't need gettext.php at all, it is provided by


More information about the scm-commits mailing list