SPECS (DEVEL): drupal.spec - merged from HEAD - avoid perl deps

[glen]

Author: glen                         Date: Thu Dec 29 15:53:09 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- merged from HEAD
- avoid perl deps

---- Files affected:
SPECS:
   drupal.spec (1.42.2.3 -> 1.42.2.4) 

---- Diffs:

================================================================
Index: SPECS/drupal.spec
diff -u SPECS/drupal.spec:1.42.2.3 SPECS/drupal.spec:1.42.2.4
--- SPECS/drupal.spec:1.42.2.3	Thu Dec 29 16:38:19 2005
+++ SPECS/drupal.spec	Thu Dec 29 16:53:04 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Platforma do zarządzania treścią o otwartych źródłach
 Name:		drupal
 Version:	4.7.0
-Release:	0.%{_beta}.1
+Release:	0.%{_beta}.3
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://drupal.org/files/projects/%{name}-%{version}-%{_beta}.tar.gz
@@ -136,6 +136,14 @@
 mają schematy bazy danych dla PostgreSQL-a. Można go używać na własne
 ryzyko.
 
+%package update
+Summary:	Package to perform Drupal database updates
+Group:		Applications/WWW
+Requires:	%{name} = %{version}-%{release}
+
+%description update
+This package contains scripts needed to do database updates via web.
+
 %package xmlrpc
 Summary:	XMLRPC server for Drupal
 Summary(pl):	Serwer XMLRPC dla Drupala
@@ -167,18 +175,23 @@
 %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 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 update.php 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 modules/* $RPM_BUILD_ROOT%{_appdir}/modules
 cp -a includes scripts $RPM_BUILD_ROOT%{_appdir}
 cp -a sites $RPM_BUILD_ROOT%{_sysconfdir}
+# avoid pulling perl dep
+chmod -x $RPM_BUILD_ROOT%{_appdir}/scripts/*
 
 ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
+# needed for node.module for syndication icon
+ln -s htdocs/misc $RPM_BUILD_ROOT%{_appdir}
 
 # install themes
 cp -a themes $RPM_BUILD_ROOT%{_appdir}/htdocs
@@ -292,7 +305,6 @@
 %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
@@ -310,6 +322,7 @@
 %{_appdir}/po
 # symlink
 %{_appdir}/files
+%{_appdir}/misc
 
 %dir %{_appdir}/htdocs
 %{_appdir}/htdocs/index.php
@@ -334,6 +347,11 @@
 %defattr(644,root,root,755)
 %doc database/*.pgsql
 
+%files update
+%defattr(644,root,root,755)
+%{_appdir}/htdocs/update.php
+%{_appdir}/database
+
 %files xmlrpc
 %defattr(644,root,root,755)
 %{_appdir}/htdocs/xmlrpc.php
@@ -344,6 +362,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.4  2005/12/29 15:53:04  glen
+- merged from HEAD
+- avoid perl deps
+
 Revision 1.42.2.3  2005/12/29 15:38:19  glen
 - adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drupal.spec?r1=1.42.2.3&r2=1.42.2.4&f=u