From 0bdcc3330cc192738ed537bb28a066b94ddff1ca Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Jul 10 2013 13:43:01 +0000 Subject: Typo and EL5 FHS fixes. --- diff --git a/drupal7.spec b/drupal7.spec index 9f3cf54..8ed8133 100644 --- a/drupal7.spec +++ b/drupal7.spec @@ -4,7 +4,7 @@ AutoReqProv: no %define drupaldir %{_datadir}/drupal7 Name: drupal7 Version: 7.22 -Release: 6%{?dist} +Release: 7%{?dist} Summary: An open-source content-management platform Group: Applications/Publishing @@ -81,7 +81,7 @@ Provides: drupal7(user) = %{version} Provides: drupal7(bartik) = %{version} Provides: drupal7(garland) = %{version} Provides: drupal7(seven) = %{version} -Provides: drupal7(stark) = %{version}emes +Provides: drupal7(stark) = %{version} ## Profiles Provides: drupal7(minimal) = %{version} Provides: drupal7(standard) = %{version} @@ -188,6 +188,9 @@ rm -rf %{buildroot} %{_prefix}/lib/rpm/%{name}.req %changelog +* Wed Jul 10 2013 Jon Ciesla - 7.22-7 +- Typo and EL5 FHS fixes, BZ 979827. + * Tue Jun 18 2013 Jon Ciesla - 7.22-6 - Add AllowOverride All to drupal7.conf, BZ 905912. diff --git a/macros.drupal7.rpm-lt-4-9-compat b/macros.drupal7.rpm-lt-4-9-compat index d3187f5..70f2bc6 100644 --- a/macros.drupal7.rpm-lt-4-9-compat +++ b/macros.drupal7.rpm-lt-4-9-compat @@ -6,6 +6,6 @@ # Macro to allow spec compatibility with RPM < 4.9 (no fileattrs) %drupal7_find_provides_and_requires %{expand: \ %global _use_internal_dependency_generator 0 -%global __find_provides %{_rpmconfigdir}/drupal7.prov %{version} -%global __find_requires %{_rpmconfigdir}/drupal7.req +%global __find_provides %{_prefix}/lib/rpm/drupal7.prov %{version} +%global __find_requires %{_prefix}/lib/rpm/drupal7.req }