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

diff --git a/drupal.spec b/drupal.spec
index 3b6bf87..0f7da2f 100644
--- a/drupal.spec
+++ b/drupal.spec
@@ -1,23 +1,21 @@
 Summary:	Open source content management platform
 Summary(pl):	Platforma do zarz±dzania tre¶ci± o otwartych ¼ród³ach
 Name:		drupal
-Version:	4.6.2
-Release:	0.22
-Epoch:		0
+Version:	4.6.3
+Release:	0.32
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://drupal.org/files/projects/%{name}-%{version}.tar.gz
-# Source0-md5:	7bbee605d6b57052e27adb1a61685ec1
+# Source0-md5:	f436973f02aa2cea15ef1ca90223082b
 Source1:	%{name}.conf
 Source2:	%{name}.cron
-Patch0:		%{name}-config.patch
-Patch1:		%{name}-includedir.patch
-Patch2:		%{name}-module-themedir.patch
-Patch3:		%{name}-emptypass.patch
-Patch4:		%{name}-themedir.patch
-Patch5:		%{name}-sitesdir.patch
-Patch6:		%{name}-topdir.patch
-Patch7:		%{name}-themedir2.patch
+Source3:	%{name}.PLD
+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
@@ -30,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)
@@ -91,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.
@@ -98,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
@@ -117,23 +152,19 @@ nazywane rozproszonym uwierzytelnianiem.
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
+%patch1 -p1
+%patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-#grep -rl 'include_once .includes/' . | xargs sed -i -e '
-#	s,include_once \(.\)includes/,include_once \1%{_appdir}/includes/,g
-#'
 
 find -name '*~' | xargs -r rm -v
+cp -p %{SOURCE3} README.PLD
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir}/{po,modules/po,htdocs/{files,modules}},%{_sysconfdir},/etc/cron.d}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.d,/var/{cache,lib}/%{name}} \
+	$RPM_BUILD_ROOT%{_appdir}/{po,modules/po,htdocs/modules}
 
 cp -a *.ico index.php $RPM_BUILD_ROOT%{_appdir}/htdocs
 cp -a misc $RPM_BUILD_ROOT%{_appdir}/htdocs
@@ -144,12 +175,22 @@ cp -a modules/* $RPM_BUILD_ROOT%{_appdir}/modules
 cp -a includes scripts $RPM_BUILD_ROOT%{_appdir}
 cp -a sites $RPM_BUILD_ROOT%{_sysconfdir}
 
-cp -a themes $RPM_BUILD_ROOT%{_appdir}/htdocs
-ln -s htdocs/files $RPM_BUILD_ROOT%{_appdir}/files
+ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
 
+# install themes
+cp -a themes $RPM_BUILD_ROOT%{_appdir}/htdocs
 # move .xtmpl/.theme out of htdocs
 (cd $RPM_BUILD_ROOT%{_appdir}/htdocs && tar cf - --remove-files themes/*/*.{xtmpl,theme}) | tar -xf - -C $RPM_BUILD_ROOT%{_appdir}
 mv $RPM_BUILD_ROOT%{_appdir}/{htdocs/,}themes/engines
+# make screenshot.png available in appdir
+for a in $RPM_BUILD_ROOT%{_appdir}/htdocs/themes/*; do
+	t=$(basename $a)
+	ln -s ../../htdocs/themes/$t/screenshot.png $RPM_BUILD_ROOT%{_appdir}/themes/$t
+done
+
+# a hack
+s=themes/chameleon/marvin
+ln -s ../../htdocs/$s $RPM_BUILD_ROOT%{_appdir}/$s
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
@@ -166,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
@@ -185,7 +230,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt database
+%doc *.txt database README.replication README.PLD
 
 %attr(750,root,http) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
@@ -209,13 +254,21 @@ fi
 %{_appdir}/htdocs/misc
 %{_appdir}/htdocs/themes
 %{_appdir}/htdocs/modules
-%dir %attr(775,root,http) %{_appdir}/htdocs/files
+
+%dir %attr(775,root,http) /var/lib/%{name}
+%dir %attr(775,root,http) /var/cache/%{name}
 
 %files cron
 %defattr(644,root,root,755)
 %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