diff --git a/.gitignore b/.gitignore index cb6ef41..85bfeda 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,7 @@ wordpress-3.0.1.tar.gz /wordpress-3.1.1.tar.gz /wordpress-3.1.2.tar.gz /wordpress-3.1.3.tar.gz -/wordpress-3.2-RC1.zip -/wordpress-3.2-RC3.zip +/wordpress-3.1.4.tar.gz /wordpress-3.2.tar.gz /wordpress-3.2.1.tar.gz /wordpress-3.3-beta2.tar.gz @@ -17,3 +16,6 @@ wordpress-3.0.1.tar.gz /wordpress-3.3-RC2.tar.gz /wordpress-3.3.tar.gz /wordpress-3.3.1.tar.gz +/wordpress-3.3.2.tar.gz +/wordpress-3.4.tar.gz +/wordpress-3.4.1.tar.gz diff --git a/sources b/sources index fb3ad90..ffdae5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e94894be6e6d213175940ccc14e6c5e4 wordpress-3.3.1.tar.gz +5f6c1dcbe0b8031235f107b7479d30a5 wordpress-3.4.1.tar.gz diff --git a/wordpress-FSF-address.patch b/wordpress-FSF-address.patch deleted file mode 100644 index 8992779..0000000 --- a/wordpress-FSF-address.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wordpress/wp-includes/kses.php.FSFaddr wordpress/wp-includes/kses.php ---- wordpress/wp-includes/kses.php.FSFaddr 2011-05-25 23:54:34.347025847 +0200 -+++ wordpress/wp-includes/kses.php 2011-05-25 23:56:18.403727954 +0200 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., -- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit -+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * http://www.gnu.org/licenses/gpl.html - * - * [kses strips evil scripts!] diff --git a/wordpress.spec b/wordpress.spec index a90049c..d1b7399 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,14 +1,15 @@ %global wp_content %{_datadir}/wordpress/wp-content -%global betatag RC2 +#%#global betatag -RC3 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.3.1 +Version: 3.4.1 Group: Applications/Publishing +#Release: 0.2.%{betatag}%{?dist} Release: 1%{?dist} License: GPLv2 -Source0: http://wordpress.org/%{name}-%{version}.tar.gz +Source0: http://wordpress.org/%{name}-%{version}%{?betatag}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu @@ -116,7 +117,23 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog -* Wed Jan 04 2012 'Matej Cepl ' - 3.3.1-1 +* Thu Jun 28 2012 Matej Cepl - 3.4.1-1 +- New upstream release. Just improvements and security issues. + +* Wed Jun 13 2012 Matej Cepl - 3.4-1 +- New upstream release. The main changes from the upstream + release notes: + * theme customizer + * XML-RPC themes and API improvements + +* Mon Apr 23 2012 'Matěj Cepl ' - 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. + +* Wed Jan 04 2012 'Matěj Cepl ' - 3.3.1-1 - Security (XSS) and maintenance upstream release. * Tue Dec 13 2011 'Matěj Cepl ' - 3.3-1 @@ -149,11 +166,8 @@ rm -rf ${RPM_BUILD_ROOT} * Tue Jul 05 2011 Matěj Cepl - 3.2-1 - New upstream release. -* Wed Jun 29 2011 Matěj Cepl - 3.2-0.1.RC3 -- Updated prerelease version (security and minor fixes). - -* Sun Jun 19 2011 Matěj Cepl - 3.2-0.1.RC1 -- Prerelease version. +* Wed Jun 29 2011 Matěj Cepl - 3.1.4-1 +- New upstream security release. * Thu Jun 02 2011 Matěj Cepl - 3.1.3-3 - Actually, we just don't need gettext.php at all, it is provided by