rpms/drupal/devel drupal-README.fedora, 1.4, 1.5 drupal.spec, 1.20, 1.21 sources, 1.17, 1.18

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/drupal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16704

Modified Files:
	drupal-README.fedora drupal.spec sources 
Log Message:
Several fixes, cron and selinux.



Index: drupal-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal-README.fedora,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drupal-README.fedora	9 Oct 2008 12:13:54 -0000	1.4
+++ drupal-README.fedora	17 Feb 2009 18:38:22 -0000	1.5
@@ -39,3 +39,22 @@
 
 To help mitigate this, uncomment the following line in /etc/httpd/conf.d/drupal.conf:
 #php_flag session.cookie_secure on
+
+
+4. Upgrading
+
+Prior to upgrading to a new version, log into each site with the first/admin user, 
+upgrade the rpm, and then run the database upgrader by navigating to
+http://site/update.php.
+
+If upgrading to version 6.9-2 or later, please note that
+the locations for the sites' files directories has changed, and that you'll need
+to move them and symlink accordingly.  A script is included in the doc folder:
+/usr/share/drupal-VERSION/drupal-files-migrator.sh.  Please use this script as a
+guideline for the changes you'll need to make. 
+
+Essentially, the site folders will stay in /etc/drupal, but from there the files folders
+will be moved to /var/lib/drupal/files/SITENAME, and symlinked accordingly.  This is done
+for SELinux reasons, see https://bugzilla.redhat.com/show_bug.cgi?id=472642.
+
+Patches to the script are welcome!


Index: drupal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/drupal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- drupal.spec	2 Jan 2009 20:59:48 -0000	1.20
+++ drupal.spec	17 Feb 2009 18:38:22 -0000	1.21
@@ -1,7 +1,7 @@
 %define drupaldir %{_datadir}/drupal
 Name: drupal
-Version:  6.8
-Release:  1%{?dist}
+Version:  6.9
+Release:  2%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -56,17 +56,6 @@
 %clean
 rm -rf %{buildroot}
 
-#drop in first f12 build.
-%pre
-if [ $1 = "1" ]; then
-	if [ ! -d %{_localstatedir}/lib/drupal/files/default ]; then
-		mkdir %{_localstatedir}/lib/drupal/files/
-		mv %{_sysconfdir}/drupal/default/files/* %{_localstatedir}/lib/drupal/files/default
-		rmdir %{_sysconfdir}/drupal/default/files
-		/sbin/restorecon %{_localstatedir}/lib/drupal/files/default/
-	fi
-fi
-
 %files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt drupal-README.fedora sites/all/README.txt drupal-files-migrator.sh
@@ -82,12 +71,20 @@
 %exclude %{_sysconfdir}/drupal/all/README.txt
 %config(noreplace) %{_sysconfdir}/drupal/default
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/drupal.conf
-%attr(755,root,apache) %{_sysconfdir}/cron.hourly/drupal
+%attr(755,root,apache) %config(noreplace) %{_sysconfdir}/cron.hourly/drupal
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/
 %dir %attr(775,root,apache) %{_localstatedir}/lib/drupal/files/default/
 
 %changelog
+* Tue Feb 17 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-2
+- Drop pre script for files move, 472642.
+- Updated drupal-README.fedora.
+- Mark cron job noreplace, BZ 485567.
+
+* Thu Jan 15 2009 Jon Ciesla <limb at jcomserv.net> - 6.9-1
+- Upgrade to 6.9, SA-CORE-2009-001.
+
 * Fri Jan 02 2009 Jon Ciesla <limb at jcomserv.net> - 6.8-1
 - Upgrade to 6.8.
 - Move files directories from sites to /var/lib/drupal/files/N for selinux reasons, 472642.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drupal/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Jan 2009 20:56:30 -0000	1.17
+++ sources	17 Feb 2009 18:38:22 -0000	1.18
@@ -1 +1 @@
-561f281b2dbee8310293a61443bdfbc7  drupal-6.8.tar.gz
+5c682a4709f4632febbe7617a784a01a  drupal-6.9.tar.gz