packages: magento/magento.spec, magento/apache.conf (NEW) - add apache.conf
glen
glen at pld-linux.org
Wed Jul 21 16:03:26 CEST 2010
Author: glen Date: Wed Jul 21 14:03:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add apache.conf
---- Files affected:
packages/magento:
magento.spec (1.1 -> 1.2) , apache.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/magento/magento.spec
diff -u packages/magento/magento.spec:1.1 packages/magento/magento.spec:1.2
--- packages/magento/magento.spec:1.1 Mon Jul 12 12:31:34 2010
+++ packages/magento/magento.spec Wed Jul 21 16:03:18 2010
@@ -8,6 +8,7 @@
URL: http://www.magentocommerce.com/
Source0: http://www.magentocommerce.com/downloads/assets/%{version}/%{name}-%{version}.tar.bz2
# Source0-md5: 74bba43bf8f5429fb26797be3fefbf0f
+Source1: apache.conf
Source2: %{name}-crontab
Source3: %{name}-cron_disabled.php
Source4: %{name}-cron_import.php
@@ -36,24 +37,14 @@
%patch3 -p1
rm -rf app/.svn
-cat <<'EOF' > apache.conf
-Alias /magento %{_appdir}/magento
-<Directory %{_appdir}/magento>
- AllowOverride All
- RewriteEngine On
- Order allow,deny
- Allow from All
-</Directory>
-EOF
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_appdir}
cp -a . $RPM_BUILD_ROOT%{_appdir}
install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_appdir}/crontab
cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/cron_disabled.php
@@ -137,5 +128,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2010/07/21 14:03:18 glen
+- add apache.conf
+
Revision 1.1 2010/07/12 10:31:34 glen
- new, based on http://openmamba.org/pub/openmamba/devel/SRPMS.i586/magento-1.4.0.0-1mamba.src.rpm
================================================================
Index: packages/magento/apache.conf
diff -u /dev/null packages/magento/apache.conf:1.1
--- /dev/null Wed Jul 21 16:03:26 2010
+++ packages/magento/apache.conf Wed Jul 21 16:03:18 2010
@@ -0,0 +1,7 @@
+Alias /magento /usr/share/magento
+<Directory /usr/share/magento>
+ AllowOverride All
+ RewriteEngine On
+ Order allow,deny
+ Allow from All
+</Directory>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magento/magento.spec?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list