diff --git a/.gitignore b/.gitignore index a3dee08..765f5a4 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 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 3d82f07..38c7271 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -146,11 +146,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