diff --git a/.gitignore b/.gitignore index 892b2de..e1aeb2f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /ctools-7.x-1.6.tar.gz /ctools-7.x-1.7.tar.gz /ctools-7.x-1.9.tar.gz +/ctools-7.x-1.10.tar.gz diff --git a/drupal7-ctools.spec b/drupal7-ctools.spec index 451834c..1bcc794 100644 --- a/drupal7-ctools.spec +++ b/drupal7-ctools.spec @@ -3,8 +3,8 @@ %global module ctools Name: drupal7-%{module} -Version: 1.9 -Release: 3%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: Primarily a set of APIs and tools to improve the developer experience Group: Applications/Publishing @@ -16,7 +16,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: drupal7-rpmbuild >= 7.23-3 -# phpcompatinfo (computed from version 1.6) +# phpcompatinfo (computed from version 1.10) Requires: php-date Requires: php-gd Requires: php-mbstring @@ -67,20 +67,10 @@ This package provides the following Drupal modules: %prep %setup -qn %{module} -# RPM README -cat > RPM-README.txt <<'RPM_README' -After installation, you must enable this module from the Drupal administration -page. - -If upgrading this module separately from the core Drupal package, be sure to -run the http://hostname/drupal7/upgrade.php script after this RPM is upgraded. -RPM_README - -# Docs -mkdir -p docs/ctools_plugin_example -mv *.txt docs -mv ctools_plugin_example/README.txt docs/ctools_plugin_example/ -mv docs/LICENSE.txt . +: Licenses and docs +mkdir -p .rpm/{licenses,docs} +mv LICENSE.txt .rpm/licenses/ +mv *.txt .rpm/docs/ %build @@ -99,14 +89,15 @@ rm -rf %{buildroot} %files %{!?_licensedir:%global license %%doc} -%license LICENSE.txt -%doc docs/* +%license .rpm/licenses/* +%doc .rpm/docs/* %{drupal7_modules}/%{module} -%exclude %{drupal7_modules}/%{module}/docs -%exclude %{drupal7_modules}/%{module}/LICENSE.txt %changelog +* Sun Sep 11 2016 Shawn Iwinski - 1.10-1 +- Updated to 1.10 (RHBZ #1370660) + * Wed Feb 03 2016 Fedora Release Engineering - 1.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 514a1ac..36ea2f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd7b5dac915e8fa3da909379807ef824 ctools-7.x-1.9.tar.gz +38bb47304f6dcd0bcd6b02ed6ee235fc ctools-7.x-1.10.tar.gz