- update to 4.6.3. security update

[packages/drupal.git] / drupal.spec

diff --git a/drupal.spec b/drupal.spec
index 1cfd09556fc3cd09d950d5589e6397d40ff88fb3..754390a46d9ffee44960b84eec1b5eb80bd6d29e 100644 (file)
--- a/drupal.spec
+++ b/drupal.spec
@@ -1,13 +1,13 @@
 Summary:       Open source content management platform
 Summary(pl):   Platforma do zarz±dzania tre¶ci± o otwartych ¼ród³ach
 Name:          drupal
-Version:       4.6.0
-Release:       0.33
+Version:       4.6.3
+Release:       0.1
 Epoch:         0
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://drupal.org/files/projects/%{name}-%{version}.tar.gz
-# Source0-md5: cba80c4f511284b09d6a0a2def5cb250
+# Source0-md5: f436973f02aa2cea15ef1ca90223082b
 Source1:       %{name}.conf
 Source2:       %{name}.cron
 Patch0:                %{name}-config.patch
@@ -17,6 +17,7 @@ Patch3:               %{name}-emptypass.patch
 Patch4:                %{name}-themedir.patch
 Patch5:                %{name}-sitesdir.patch
 Patch6:                %{name}-topdir.patch
+Patch7:                %{name}-themedir2.patch
 URL:           http://drupal.org/
 BuildRequires: rpmbuild(macros) >= 1.194
 BuildRequires: sed >= 4.0
@@ -97,15 +98,32 @@ 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 xmlrpc
+Summary:       XMLRPC server for Drupal
+Summary(pl):   Serwer XMLRPC dla Drupala
+Group:         Applications/WWW
+Requires:      %{name} = %{version}-%{release}
+
+%description xmlrpc
+XMLRPC server for Drupal allows other Drupals authorize with your
+Drupal's user creditentials, this is called Distributed Authentication
+in Drupal world.
+
+%description xmlrpc -l pl
+Serwer XMLRPC dla Drupala pozwala innym Drupalom autoryzowaæ siê z
+danymi uwierzytelniaj±cymi u¿ytkownika danego Drupala - jest to
+nazywane rozproszonym uwierzytelnianiem.
+
 %prep
 %setup -q
 %patch0 -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
@@ -115,21 +133,25 @@ find -name '*~' | xargs -r rm -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir}/htdocs,%{_sysconfdir},/etc/cron.d}
+install -d $RPM_BUILD_ROOT{%{_appdir}/{po,modules/po,htdocs/{files,modules}},%{_sysconfdir},/etc/cron.d}
 
 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 cron.php $RPM_BUILD_ROOT%{_appdir}
-cp -a includes modules scripts $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}
 
 cp -a themes $RPM_BUILD_ROOT%{_appdir}/htdocs
-# move .xtmpl out of htdocs
-(cd $RPM_BUILD_ROOT%{_appdir}/htdocs && tar cf - --remove-files themes/*/*.xtmpl) | tar -xf - -C $RPM_BUILD_ROOT%{_appdir}
+ln -s htdocs/files $RPM_BUILD_ROOT%{_appdir}/files
+
+# 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
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
 %clean
@@ -139,24 +161,24 @@ rm -rf $RPM_BUILD_ROOT
 if [ "$1" = 1 ]; then
 %banner -e %{name} <<EOF
 If this is your first install of Drupal, you need to create drupal database:
-shell$ mysqladmin create drupal
+mysqladmin create drupal
 
 and import initial schema:
-shell$ zcat %{_docdir}/%{name}-%{version}/database/database.mysql.gz | mysql drupal
+zcat %{_docdir}/%{name}-%{version}/database/database.mysql.gz | mysql drupal
 
-(anyway, read INSTALL file from documentation).
+Also read INSTALL from documentation!
 
 EOF
 fi
 
 %triggerin -- apache1 >= 1.3.33-2
-%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
 
 %triggerun -- apache1 >= 1.3.33-2
 %apache_config_uninstall -v 1
 
 %triggerin -- apache >= 2.0.0
-%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf
 
 %triggerun -- apache >= 2.0.0
 %apache_config_uninstall -v 2
@@ -166,20 +188,34 @@ fi
 %doc *.txt database
 
 %attr(750,root,http) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache-%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 
 %attr(750,root,http) %dir %{_sysconfdir}/sites
 %attr(750,root,http) %dir %{_sysconfdir}/sites/default
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites/default/*
 
 %dir %{_appdir}
-%{_appdir}/htdocs
 %{_appdir}/includes
 %{_appdir}/modules
 %{_appdir}/scripts
 %{_appdir}/themes
+%{_appdir}/po
+# symlink
+%{_appdir}/files
+
+%dir %{_appdir}/htdocs
+%{_appdir}/htdocs/*.ico
+%{_appdir}/htdocs/index.php
+%{_appdir}/htdocs/misc
+%{_appdir}/htdocs/themes
+%{_appdir}/htdocs/modules
+%dir %attr(775,root,http) %{_appdir}/htdocs/files
 
 %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 xmlrpc
+%defattr(644,root,root,755)
+%{_appdir}/htdocs/xmlrpc.php