-# TODO
-# - http://drupal.org/node/39670
+%define _ver 4.6
+%define _patchlevel 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.4
-Release: 0.13
+Version: %{_ver}.%{_patchlevel}
+Release: 3
License: GPL
Group: Applications/WWW
Source0: http://drupal.org/files/projects/%{name}-%{version}.tar.gz
-# Source0-md5: c61d95c766a7ff624abbe04c2430e5df
+# Source0-md5: 8c15ded4450a1afcf0c5b6593dc74541
Source1: %{name}.conf
Source2: %{name}.cron
Source3: %{name}.PLD
Patch3: %{name}-themedir2.patch
Patch4: %{name}-emptypass.patch
Patch5: %{name}-cron.patch
-# http://drupal.org/node/39566
-Patch6: http://drupal.org/files/issues/check_url.patch
+Patch6: %{name}-19298-cache.patch
+Patch7: %{name}-update-cli.patch
+Patch8: %{name}-locale-memory.patch
+Patch9: %{name}-comment.patch
URL: http://drupal.org/
BuildRequires: rpmbuild(macros) >= 1.264
BuildRequires: sed >= 4.0
-Requires: webapps
-Requires: webserver = apache
-Requires: apache(mod_dir)
+Requires: %{name}(DB_Driver) = %{version}-%{release}
+Requires: %{name}(theme) = %{_ver}
Requires: apache(mod_access)
+Requires: apache(mod_alias)
+Requires: apache(mod_dir)
Requires: apache(mod_expires)
Requires: apache(mod_rewrite)
-Requires: apache(mod_alias)
Requires: php >= 3:4.3.3
Requires: php-mysql
Requires: php-pcre
-Requires: %{name}(DB_Driver) = %{version}-%{release}
Requires: php-xml
+Requires: webapps
+Requires: webserver = apache
+Obsoletes: drupal-update
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Summary(pl): Us³uga cron dla Drupala
Group: Applications/WWW
Requires: %{name} = %{version}-%{release}
+Requires: /usr/bin/php
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.
This virtual package provides MySQL database backend for Drupal.
%description db-mysql -l pl
-Ten wirtualny pakiet dostarcza backend bazy danych MySQL dla
-Drupala.
+Ten wirtualny pakiet dostarcza backend bazy danych MySQL dla Drupala.
%package db-pgsql
Summary: Drupal DB Driver for PostgreSQL
Provides: %{name}(DB_Driver) = %{version}-%{release}
%description db-pgsql
-This virtual package provides PostgreSQL database backend for
-Drupal.
+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!
maj± schematy bazy danych dla PostgreSQL-a. Mo¿na go u¿ywaæ na w³asne
ryzyko.
+%package themes
+Summary: Themes distributed with Drupal
+Summary(pl): Motywy rozprowadzane z Drupalem
+Group: Applications/WWW
+Requires: %{name} = %{version}-%{release}
+Provides: drupal(theme) = %{_ver}
+
+%description themes
+This package contains themes distributed with Drupal.
+
+%description themes -l pl
+Ten pakiet zawiera motywy rozprowadzane z Drupalem.
+
%package xmlrpc
Summary: XMLRPC server for Drupal
Summary(pl): Serwer XMLRPC dla Drupala
%patch4 -p1
%patch5 -p1
%patch6 -p0
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
find -name '*~' | xargs -r rm -v
cp -p %{SOURCE3} README.PLD
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.d,/var/{cache,lib}/%{name}} \
- $RPM_BUILD_ROOT%{_appdir}/{po,modules/po,htdocs/modules}
+ $RPM_BUILD_ROOT%{_appdir}/{po,database,modules/po,htdocs/modules}
cp -a *.ico index.php $RPM_BUILD_ROOT%{_appdir}/htdocs
cp -a misc $RPM_BUILD_ROOT%{_appdir}/htdocs
cp -a xmlrpc.php $RPM_BUILD_ROOT%{_appdir}/htdocs
+cp -a database/updates.inc $RPM_BUILD_ROOT%{_appdir}/database
-cp -a cron.php $RPM_BUILD_ROOT%{_appdir}
+cp -a cron.php update.php $RPM_BUILD_ROOT%{_appdir}
cp -a modules/* $RPM_BUILD_ROOT%{_appdir}/modules
cp -a includes scripts $RPM_BUILD_ROOT%{_appdir}
cp -a sites $RPM_BUILD_ROOT%{_sysconfdir}
%triggerun -- apache1
%webapp_unregister apache %{_webapp}
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
%webapp_register httpd %{_webapp}
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
%triggerpostun -- %{name} < 4.6.4-0.4
fi
if [ "$httpd_reload" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
if [ "$apache_reload" ]; then
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache reload 1>&2
- fi
+ %service -q apache reload
fi
+%triggerpostun -- %{name} < 4.6.7-2.6
+grep -c This_is_a_Drupal_security_line_do_not_remove \
+%{_sysconfdir}/apache.conf %{_sysconfdir}/httpd.conf \
+| awk -F: '/:0/{print $1}' | xargs -r \
+sed -i -e '
+/<Directory \/var\/lib\/drupal>/{
+ n
+ a\ SetHandler This_is_a_Drupal_security_line_do_not_remove
+}'
+[ ! -L /etc/httpd/webapps.d/drupal.conf ] || %service -q httpd reload
+[ ! -L /etc/apache/webapps.d/drupal.conf ] || %service -q apache reload
+
%files
%defattr(644,root,root,755)
%doc *.txt README.PLD
-%doc database/updates.inc
%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites/default/*
%dir %{_appdir}
+%{_appdir}/database
%{_appdir}/includes
+%exclude %{_appdir}/includes/database.mysql.inc
+%exclude %{_appdir}/includes/database.pgsql.inc
%{_appdir}/modules
%{_appdir}/scripts
-%{_appdir}/themes
+%dir %{_appdir}/themes
+%dir %{_appdir}/themes/engines
%{_appdir}/po
-# symlink
+%{_appdir}/update.php
+# symlinks
%{_appdir}/files
+%{_appdir}/misc
%dir %{_appdir}/htdocs
%{_appdir}/htdocs/*.ico
%{_appdir}/htdocs/index.php
%{_appdir}/htdocs/misc
-%{_appdir}/htdocs/themes
+%dir %{_appdir}/htdocs/themes
%{_appdir}/htdocs/modules
%dir %attr(775,root,http) /var/lib/%{name}
%defattr(644,root,root,755)
%doc database/*.mysql
%doc README.replication
+%{_appdir}/includes/database.mysql.inc
%files db-pgsql
%defattr(644,root,root,755)
%doc database/*.pgsql
+%{_appdir}/includes/database.pgsql.inc
+
+%files themes
+%defattr(644,root,root,755)
+%{_appdir}/themes/[!e]*
+%{_appdir}/themes/engines/*
+%{_appdir}/htdocs/themes/*
%files xmlrpc
%defattr(644,root,root,755)
projects / packages / drupal.git / blobdiff