SPECS (DEVEL): drupal.spec - beta2, NFY

[glen]

Author: glen                         Date: Tue Dec 20 15:03:20 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- beta2, NFY

---- Files affected:
SPECS:
   drupal.spec (1.42.2.1 -> 1.42.2.2) 

---- Diffs:

================================================================
Index: SPECS/drupal.spec
diff -u SPECS/drupal.spec:1.42.2.1 SPECS/drupal.spec:1.42.2.2
--- SPECS/drupal.spec:1.42.2.1	Fri Dec  9 18:26:49 2005
+++ SPECS/drupal.spec	Tue Dec 20 16:03:15 2005
@@ -1,17 +1,14 @@
 # $Revision$, $Date$
-# TODO
-# - http://drupal.org/node/39670
 Summary:	Open source content management platform
 Summary(pl):	Platforma do zarządzania treścią o otwartych źródłach
 Name:		drupal
 Version:	4.7.0
-%define	_beta	beta1
+%define	_beta	beta2
 Release:	0.%{_beta}.1
 License:	GPL
 Group:		Applications/WWW
-#Source0:	http://drupal.org/files/projects/%{name}-%{version}.tar.gz
-Source0:	http://drupal.org/files/projects/%{name}-%{version}-beta1.tar.gz
-# Source0-md5:	42c9efed2923e498dcc757194158df8a
+Source0:	http://drupal.org/files/projects/%{name}-%{version}-%{_beta}.tar.gz
+# Source0-md5:	0b6d8fd9bd08e7651cf91ff2e95c1c31
 Source1:	%{name}.conf
 Source2:	%{name}.cron
 Source3:	%{name}.PLD
@@ -21,23 +18,21 @@
 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
 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:	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:	php >= 3:4.3.3
+Requires:	webapps
+Requires:	webserver = apache
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -97,9 +92,9 @@
 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.
@@ -158,14 +153,13 @@
 nazywane rozproszonym uwierzytelnianiem.
 
 %prep
-%setup -q %{?_beta:-n %{name}-cvs}
+%setup -q %{?_beta:-n %{name}-%{version}-%{_beta}}
 #%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 #%patch4 -p1
-%patch5 -p1
-#%patch6 -p0
+#%patch5 -p1
 
 find -name '*~' | xargs -r rm -v
 cp -p %{SOURCE3} README.PLD
@@ -350,6 +344,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.2  2005/12/20 15:03:15  glen
+- beta2, NFY
+
 Revision 1.42.2.1  2005/12/09 17:26:49  glen
 - 4.7.0-beta1
 
================================================================

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