SPECS: moodle.spec - altering sources should be done in %prep

[glen]

Author: glen                         Date: Sun Nov 20 22:51:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- altering sources should be done in %prep

---- Files affected:
SPECS:
   moodle.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/moodle.spec
diff -u SPECS/moodle.spec:1.23 SPECS/moodle.spec:1.24
--- SPECS/moodle.spec:1.23	Tue Oct 25 15:47:51 2005
+++ SPECS/moodle.spec	Sun Nov 20 23:51:41 2005
@@ -23,10 +23,10 @@
 Requires:	php-session
 Requires:	php
 %if %{without apache1}
-Requires:	apache >= 2
+Requires:	apache >= 2.0
 %endif
 %if %{with apache1}
-Requires:	apache < 2
+Requires:	apache1
 %endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,10 +66,6 @@
 %setup -q -n %{name}
 %patch0 -p1
 
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_moodledir},%{_moodledata},%{_sysconfdir}/themes,/etc/httpd/httpd.conf}
-
 # Move docs into proper place:
 mv -f auth/README README_auth.txt
 mv -f auth/fc/Readme.txt README_auth_fc.txt
@@ -86,6 +82,10 @@
 mv -f mod/scorm/README.txt README_mod_scorm.txt
 mv -f theme/UPGRADE.txt UPGRADE_theme.txt
 
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_moodledir},%{_moodledata},%{_sysconfdir}/themes,/etc/httpd/httpd.conf}
+
 # Instalation:
 cp -R * $RPM_BUILD_ROOT%{_moodledir}
 
@@ -261,6 +261,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/11/20 22:51:41  glen
+- altering sources should be done in %prep
+
 Revision 1.23  2005/10/25 13:47:51  baggins
 - updated install and files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/moodle.spec?r1=1.23&r2=1.24&f=u