[drupal7/el5: 2/2] Merge branch 'el6' into el5

Jon Ciesla limb at fedoraproject.org
Mon Jun 3 15:33:03 UTC 2013


commit 6d5e0adbe3aa8e0cfc697662639137727c4b1c0a
Merge: c8cf0a4 039b1a5
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jun 3 10:28:30 2013 -0500

    Merge branch 'el6' into el5

 drupal7.attr                     |    3 +-
 drupal7.prov                     |   17 +++++++--
 drupal7.prov.rpm-lt-4-9-compat   |   17 +++++++--
 drupal7.req                      |   27 ++++++++++++++
 drupal7.req.rpm-lt-4-9-compat    |   42 ++++++++++++++++++++++
 drupal7.spec                     |   72 +++++++++++++++++++++++++++++++++++--
 macros.drupal7                   |    6 ++--
 macros.drupal7.rpm-lt-4-9-compat |    9 +++--
 8 files changed, 175 insertions(+), 18 deletions(-)
---
diff --cc drupal7.spec
index e3185b2,a564a83..4892db7
--- a/drupal7.spec
+++ b/drupal7.spec
@@@ -25,8 -27,65 +27,65 @@@ Patch1:  drupal-7.14-CVE-2012-2922.patc
  
  BuildArch: noarch
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 -Requires: php, php-gd, php-mbstring, wget, php-pdo, php-xml
 +Requires: php53, php53-gd, php53-mbstring, wget, php53-pdo, php53-xml
  
+ # Virtual provides
+ ## Core
+ Provides: drupal7(core) = %{version}
+ ## Modules
+ Provides: drupal7(aggregator) = %{version}
+ Provides: drupal7(block) = %{version}
+ Provides: drupal7(blog) = %{version}
+ Provides: drupal7(book) = %{version}
+ Provides: drupal7(color) = %{version}
+ Provides: drupal7(comment) = %{version}
+ Provides: drupal7(contact) = %{version}
+ Provides: drupal7(contextual) = %{version}
+ Provides: drupal7(dashboard) = %{version}
+ Provides: drupal7(dblog) = %{version}
+ Provides: drupal7(field_sql_storage) = %{version}
+ Provides: drupal7(field_ui) = %{version}
+ Provides: drupal7(field) = %{version}
+ Provides: drupal7(file) = %{version}
+ Provides: drupal7(filter) = %{version}
+ Provides: drupal7(forum) = %{version}
+ Provides: drupal7(help) = %{version}
+ Provides: drupal7(image) = %{version}
+ Provides: drupal7(list) = %{version}
+ Provides: drupal7(locale) = %{version}
+ Provides: drupal7(menu) = %{version}
+ Provides: drupal7(node) = %{version}
+ Provides: drupal7(number) = %{version}
+ Provides: drupal7(openid) = %{version}
+ Provides: drupal7(options) = %{version}
+ Provides: drupal7(overlay) = %{version}
+ Provides: drupal7(path) = %{version}
+ Provides: drupal7(php) = %{version}
+ Provides: drupal7(poll) = %{version}
+ Provides: drupal7(rdf) = %{version}
+ Provides: drupal7(search) = %{version}
+ Provides: drupal7(shortcut) = %{version}
+ Provides: drupal7(simpletest) = %{version}
+ Provides: drupal7(statistics) = %{version}
+ Provides: drupal7(syslog) = %{version}
+ Provides: drupal7(system) = %{version}
+ Provides: drupal7(taxonomy) = %{version}
+ Provides: drupal7(text) = %{version}
+ Provides: drupal7(toolbar) = %{version}
+ Provides: drupal7(tracker) = %{version}
+ Provides: drupal7(translation) = %{version}
+ Provides: drupal7(trigger) = %{version}
+ Provides: drupal7(update) = %{version}
+ Provides: drupal7(user) = %{version}
+ ## Themes
+ Provides: drupal7(bartik) = %{version}
+ Provides: drupal7(garland) = %{version}
+ Provides: drupal7(seven) = %{version}
+ Provides: drupal7(stark) = %{version}emes
+ ## Profiles
+ Provides: drupal7(minimal) = %{version}
+ Provides: drupal7(standard) = %{version}
+ 
  %description
  Equipped with a powerful blend of features, Drupal is a Content Management
  System written in PHP that can support a variety of websites ranging from


More information about the scm-commits mailing list