- merge drupal-apache1.conf back to main apache config, i don't see what is that...

[packages/drupal.git] / drupal.spec

diff --git a/drupal.spec b/drupal.spec
index ed3ed43b343bde8b2c61df145ef5f2fd76cdee74..153ca2ddb47cec693a4bbc2ea1ebe11a3ef01041 100644 (file)
--- a/drupal.spec
+++ b/drupal.spec
@@ -12,7 +12,6 @@ Source0:      http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.tar.
 Source1:       %{name}.conf
 Source2:       %{name}.cron
 Source3:       %{name}.PLD
-Source4:       %{name}-apache1.conf
 Patch0:                %{name}-cron.patch
 Patch1:                %{name}-sitesdir.patch
 Patch2:                %{name}-topdir.patch
@@ -202,7 +201,7 @@ chmod -x $RPM_BUILD_ROOT%{_appdir}/scripts/*
 
 ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}