X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=drupal.spec;h=0f7da2fad1160ec0b29ce78b21d34dc9585213d6;hb=f7c6dec347e214e8cf1da9a19b5e2f566f8d810d;hp=51cbf4eadc96bb4650ac92e5e682bc0cb27dca73;hpb=8ade80fb82d54d9149a215b534d3a8ca70199f6f;p=packages%2Fdrupal.git

diff --git a/drupal.spec b/drupal.spec
index 51cbf4e..0f7da2f 100644
--- a/drupal.spec
+++ b/drupal.spec
@@ -2,8 +2,7 @@ Summary:	Open source content management platform
 Summary(pl):	Platforma do zarz±dzania tre¶ci± o otwartych ¼ród³ach
 Name:		drupal
 Version:	4.6.3
-Release:	0.21
-Epoch:		0
+Release:	0.32
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://drupal.org/files/projects/%{name}-%{version}.tar.gz
@@ -11,11 +10,12 @@ Source0:	http://drupal.org/files/projects/%{name}-%{version}.tar.gz
 Source1:	%{name}.conf
 Source2:	%{name}.cron
 Source3:	%{name}.PLD
-Patch3:		%{name}-replication.patch
-Patch5:		%{name}-sitesdir.patch
-Patch6:		%{name}-topdir.patch
-Patch7:		%{name}-themedir2.patch
-Patch8:		%{name}-emptypass.patch
+Patch0:		%{name}-replication.patch
+Patch1:		%{name}-sitesdir.patch
+Patch2:		%{name}-topdir.patch
+Patch3:		%{name}-themedir2.patch
+Patch4:		%{name}-emptypass.patch
+Patch5:		%{name}-cron.patch
 URL:		http://drupal.org/
 BuildRequires:	rpmbuild(macros) >= 1.194
 BuildRequires:	sed >= 4.0
@@ -28,7 +28,7 @@ Requires:	apache(mod_alias)
 Requires:	php >= 3:4.3.3
 Requires:	php-mysql
 Requires:	php-pcre
-#Requires:	php-pgsql
+Requires:	%{name}(DB_Driver) = %{version}-%{release}
 Requires:	php-xml
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -89,6 +89,7 @@ Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
 Requires:	php-cli >= 3:4.3.3
+Requires:	/usr/bin/php
 
 %description cron
 This package contains script which invokes cron hooks for Drupal.
@@ -96,6 +97,42 @@ This package contains script which invokes cron hooks for Drupal.
 %description cron -l pl
 Ten pakiet zawiera skrypt wywo³uj±cy uchwyty crona dla Drupala.
 
+%package db-mysql
+Summary:	Drupal DB Driver for MySQL
+Summary(pl):	Sterownik bazy danych MySQL dla Drupala
+Group:		Applications/WWW
+Requires:	php-mysql
+Provides:	%{name}(DB_Driver) = %{version}-%{release}
+
+%description db-mysql
+This virtual package provides MySQL database backend for Drupal.
+
+%description db-mysql -l pl
+Ten wirtualny pakiet dostarcza backend bazy danych MySQL dla
+Drupala.
+
+%package db-pgsql
+Summary:	Drupal DB Driver for PostgreSQL
+Summary(pl):	Sterownik bazy danych PostgreSQL dla Drupala
+Group:		Applications/WWW
+Requires:	php-pgsql
+Provides:	%{name}(DB_Driver) = %{version}-%{release}
+
+%description db-pgsql
+This virtual package provides PostgreSQL database backend for
+Drupal.
+
+NOTE: This driver is not tested in PLD, and not all modules have
+database schema for PostgreSQL. Use this driver at your own risk!
+
+%description db-pgsql -l pl
+Ten wirtualny pakiet dostarcza backend bazy danych PostgreSQL dla
+Drupala.
+
+UWAGA: Ten sterownik nie by³ testowany w PLD i nie wszystkie modu³y
+maj± schematy bazy danych dla PostgreSQL-a. Mo¿na go u¿ywaæ na w³asne
+ryzyko.
+
 %package xmlrpc
 Summary:	XMLRPC server for Drupal
 Summary(pl):	Serwer XMLRPC dla Drupala
@@ -114,14 +151,15 @@ nazywane rozproszonym uwierzytelnianiem.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 find -name '*~' | xargs -r rm -v
-cp %{SOURCE3} README.PLD
+cp -p %{SOURCE3} README.PLD
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -169,7 +207,11 @@ mysqladmin create drupal
 and import initial schema:
 zcat %{_docdir}/%{name}-%{version}/database/database.mysql.gz | mysql drupal
 
-Also read INSTALL from documentation!
+and grant permissions:
+mysql -e "GRANT SELECT, INSERT, UPDATE, DELETE ON drupal.* TO 'drupal'@'localhost' IDENTIFIED BY 'PASSWORD'"
+mysql -e "GRANT CREATE TEMPORARY TABLES, LOCK TABLES ON *.* TO 'drupal'@'localhost"
+
+Be sure to read INSTALL.txt from documentation!
 
 EOF
 fi
@@ -221,6 +263,12 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %{_appdir}/cron.php
 
+%files db-mysql
+%defattr(644,root,root,755)
+
+%files db-pgsql
+%defattr(644,root,root,755)
+
 %files xmlrpc
 %defattr(644,root,root,755)
 %{_appdir}/htdocs/xmlrpc.php