From e694b1c41a4553258520b898b8e5b72ca5afb2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Sat, 30 Jul 2011 22:44:11 +0200 Subject: [PATCH 1/8] Rebuild against new libraries. --- wordpress.spec | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 073bcbe..42fe612 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,9 +1,11 @@ +%global wp_content %{_datadir}/wordpress/wp-content + Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 3.2.1 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz Source1: wordpress-httpd-conf @@ -52,6 +54,10 @@ cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php /bin/cp %{SOURCE2} ./README.fedora /bin/cp %{SOURCE3} ./README.fedora-multiuser + +# Create additional wp-content directories so we can own them +install -d ${RPM_BUILD_ROOT}%{wp_content}/{plugins,themes,upgrade,uploads} + # Remove empty files to make rpmlint happy find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; # These are docs, remove them from here, docify them later @@ -65,20 +71,19 @@ 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 backup copies of patches -find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) -print -delete +find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ + -print -delete ## Move wp-content directory to /var/www location #mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress -#mv -v ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-content/ \ +#mv -v ${RPM_BUILD_ROOT}%{wp_content}/ \ # ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress - #%post #if [ $1 -eq 2 ] ; then ## In case user has old wp-content from previous version, move it to ## the new location. -#mv -uf %{_datadir}/wordpress/wp-content/* \ -# %{_localstatedir}/www/wordpress/ +#mv -uf %{wp_content}/* %{_localstatedir}/www/wordpress/ #/sbin/restorecon -R %{_localstatedir}/www/wordpress/ #fi @@ -91,8 +96,15 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_datadir}/wordpress %{_datadir}/wordpress/wp-admin %{_datadir}/wordpress/wp-includes -%{_datadir}/wordpress/wp-content %{_datadir}/wordpress/index.php +%dir %{wp_content}/ +%{wp_content}/index.php +%dir %attr(0775,apache,ftp) %{wp_content}/plugins +%dir %attr(0775,apache,ftp) %{wp_content}/themes +%dir %attr(0775,apache,ftp) %{wp_content}/upgrade +%dir %attr(0775,apache,ftp) %{wp_content}/uploads +%{wp_content}/plugins/* +%{wp_content}/themes/* %doc license.txt %doc readme.html %doc README.fedora @@ -103,6 +115,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sat Jul 30 2011 Matěj Cepl - 3.2.1-2 +- Rebuilt against new libraries. + * Wed Jul 13 2011 Matěj Cepl - 3.2.1-1 - New upstream release. Small fixes missed in 3.2. From 722c7affce853b85ed8b84f78305bd76f3305ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Thu, 20 Oct 2011 11:49:47 +0200 Subject: [PATCH 2/8] Upstream beta release, to test build in Rawhide. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f07bb74..54cfe52 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.2-RC3.zip /wordpress-3.2.tar.gz /wordpress-3.2.1.tar.gz +/wordpress-3.3-beta2.tar.gz diff --git a/sources b/sources index 5b9fe7c..ae9b5fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7dc263818637962b82deec04b86dbac6 wordpress-3.2.1.tar.gz +1dbc23931c1a19518c585feea4b0986e wordpress-3.3-beta2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 42fe612..81846e2 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,13 +1,14 @@ %global wp_content %{_datadir}/wordpress/wp-content +%global betatag beta2 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.2.1 +Version: 3.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 0.1.%{betatag}%{?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 @@ -115,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Thu Oct 20 2011 'Matěj Cepl ' - 3.3-0.1.beta2 +- New upstream beta release (just for Rawhide, to be sure we build) + * Sat Jul 30 2011 Matěj Cepl - 3.2.1-2 - Rebuilt against new libraries. From 98d078fe7e9b2fecfb00aaf8606d4d292ea93fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Wed, 9 Nov 2011 09:36:36 +0100 Subject: [PATCH 3/8] New upstream beta --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 54cfe52..4be9cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.2.tar.gz /wordpress-3.2.1.tar.gz /wordpress-3.3-beta2.tar.gz +/wordpress-3.3-beta3.tar.gz diff --git a/sources b/sources index ae9b5fe..90111ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dbc23931c1a19518c585feea4b0986e wordpress-3.3-beta2.tar.gz +9e6ac80ec3ec907c19e212447edebf26 wordpress-3.3-beta3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 81846e2..670e429 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,5 +1,5 @@ %global wp_content %{_datadir}/wordpress/wp-content -%global betatag beta2 +%global betatag beta3 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -116,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Nov 09 2011 'Matěj Cepl ' - 3.3-0.1.beta3 +- Another upstream beta release. + * Thu Oct 20 2011 'Matěj Cepl ' - 3.3-0.1.beta2 - New upstream beta release (just for Rawhide, to be sure we build) From 3ea19211e7cbab2c124063b9d6c63b8814d16296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Fri, 11 Nov 2011 21:21:33 +0100 Subject: [PATCH 4/8] Fix version requirement and another upstream beta release. --- wordpress.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 670e429..bba30c2 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -6,7 +6,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.3 Group: Applications/Publishing -Release: 0.1.%{betatag}%{?dist} +Release: 0.3.%{betatag}%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source1: wordpress-httpd-conf @@ -18,7 +18,7 @@ Patch0: wordpress-debian_patches_hello.patch # Move wp-content to /var/www/wordpress/ Patch1: wordpress-move-wp-content.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: php >= 4.1.0, webserver, php-mysql, php-gettext, php-simplepie +Requires: php >= 5.2.4, webserver, php-mysql, php-gettext, php-simplepie Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 BuildArch: noarch @@ -116,8 +116,11 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog -* Wed Nov 09 2011 'Matěj Cepl ' - 3.3-0.1.beta3 -- Another upstream beta release. +* Fri Nov 11 2011 'Matěj Cepl ' - 3.3-0.3.beta3 +- Fix version requirement for php (Closes #753192) + +* Wed Nov 09 2011 'Matěj Cepl ' - 3.3-0.2.beta3 +- Another upstream beta release. * Thu Oct 20 2011 'Matěj Cepl ' - 3.3-0.1.beta2 - New upstream beta release (just for Rawhide, to be sure we build) From 0cccbd628fc38dc63775e40d2716ea3f98f0b815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Thu, 24 Nov 2011 10:13:37 +0100 Subject: [PATCH 5/8] New beta. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4be9cc3..dd1ae53 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.2.1.tar.gz /wordpress-3.3-beta2.tar.gz /wordpress-3.3-beta3.tar.gz +/wordpress-3.3-beta4.tar.gz diff --git a/sources b/sources index 90111ad..7592c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e6ac80ec3ec907c19e212447edebf26 wordpress-3.3-beta3.tar.gz +8a103f28f6c233c75d34a38cecce621b wordpress-3.3-beta4.tar.gz diff --git a/wordpress.spec b/wordpress.spec index bba30c2..e6ea9c0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,5 +1,5 @@ %global wp_content %{_datadir}/wordpress/wp-content -%global betatag beta3 +%global betatag beta4 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -116,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Thu Nov 24 2011 'Matěj Cepl ' - 3.3-0.3.beta4 +- Another upstream beta release (now hopefully, really close to RC) + * Fri Nov 11 2011 'Matěj Cepl ' - 3.3-0.3.beta3 - Fix version requirement for php (Closes #753192) From 7e7100559dbeade385148c1cd961c814939c85f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 6 Dec 2011 15:09:30 +0100 Subject: [PATCH 6/8] We are on the release candidate, yuhoo! --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd1ae53..1212d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.3-beta2.tar.gz /wordpress-3.3-beta3.tar.gz /wordpress-3.3-beta4.tar.gz +/wordpress-3.3-RC1.tar.gz diff --git a/sources b/sources index 7592c57..328e371 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a103f28f6c233c75d34a38cecce621b wordpress-3.3-beta4.tar.gz +190b4cee11eac57fb3942f3a540cc8f5 wordpress-3.3-RC1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index e6ea9c0..4d1f127 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,12 +1,12 @@ %global wp_content %{_datadir}/wordpress/wp-content -%global betatag beta4 +%global betatag RC1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 3.3 Group: Applications/Publishing -Release: 0.3.%{betatag}%{?dist} +Release: 0.4.%{betatag}%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source1: wordpress-httpd-conf @@ -116,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Dec 06 2011 'Matěj Cepl ' - 3.3-0.4.RC1 +- Cool we are on RC1! + * Thu Nov 24 2011 'Matěj Cepl ' - 3.3-0.3.beta4 - Another upstream beta release (now hopefully, really close to RC) From 32e613850a9f124b44c1bf7b1cc4e1099f5ecf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Wed, 7 Dec 2011 16:24:29 +0100 Subject: [PATCH 7/8] And yet another RC. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1212d0a..d2c38b0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.3-beta3.tar.gz /wordpress-3.3-beta4.tar.gz /wordpress-3.3-RC1.tar.gz +/wordpress-3.3-RC2.tar.gz diff --git a/sources b/sources index 328e371..cd005e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -190b4cee11eac57fb3942f3a540cc8f5 wordpress-3.3-RC1.tar.gz +5e63a57f47128243690b9f195edb578c wordpress-3.3-RC2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 4d1f127..ee44fb5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,12 +1,12 @@ %global wp_content %{_datadir}/wordpress/wp-content -%global betatag RC1 +%global betatag RC2 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 3.3 Group: Applications/Publishing -Release: 0.4.%{betatag}%{?dist} +Release: 0.5.%{betatag}%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz Source1: wordpress-httpd-conf @@ -116,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Dec 07 2011 'Matěj Cepl ' - 3.3-0.5.RC2 +- ... and one day after I upgraded to RC1, we have new RC2 ;) + * Tue Dec 06 2011 'Matěj Cepl ' - 3.3-0.4.RC1 - Cool we are on RC1! From 2fb094f01e8e267fc0690b89e800b37d6dbd07db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= Date: Tue, 13 Dec 2011 00:47:57 +0100 Subject: [PATCH 8/8] New upstream release. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d2c38b0..a3dee08 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.3-beta4.tar.gz /wordpress-3.3-RC1.tar.gz /wordpress-3.3-RC2.tar.gz +/wordpress-3.3.tar.gz diff --git a/sources b/sources index cd005e1..83260c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e63a57f47128243690b9f195edb578c wordpress-3.3-RC2.tar.gz +0bb9a6c3bfb96659a2312722f913e8c3 wordpress-3.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index ee44fb5..3d82f07 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -6,9 +6,9 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.3 Group: Applications/Publishing -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}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu @@ -116,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Dec 13 2011 'Matěj Cepl ' - 3.3-1 +- New upstream release. + * Wed Dec 07 2011 'Matěj Cepl ' - 3.3-0.5.RC2 - ... and one day after I upgraded to RC1, we have new RC2 ;)