[drupal7-context] Updated to 3.2 (BZ #1059560)
Shawn Iwinski
siwinski at fedoraproject.org
Sat Feb 15 20:59:42 UTC 2014
commit 25df6ccae5a3b76976a922b23a5521340a934b08
Author: Shawn Iwinski <siwinski at redhat.com>
Date: Sat Feb 15 15:59:51 2014 -0500
Updated to 3.2 (BZ #1059560)
- Release notes: https://drupal.org/node/2183729)
- Spec cleanup
.gitignore | 1 +
LICENSE.txt | 339 -------------------------------------
drupal7-context-RPM-README.txt | 5 +
drupal7-context-fedora-README.txt | 6 -
drupal7-context.spec | 79 +++++----
sources | 1 +
6 files changed, 51 insertions(+), 380 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7986275..70f2cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/context-7.x-3.0-beta7.tar.gz
/context-7.x-3.0-rc1.tar.gz
/context-7.x-3.1.tar.gz
+/context-7.x-3.2.tar.gz
diff --git a/drupal7-context-RPM-README.txt b/drupal7-context-RPM-README.txt
new file mode 100644
index 0000000..e15a506
--- /dev/null
+++ b/drupal7-context-RPM-README.txt
@@ -0,0 +1,5 @@
+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.
diff --git a/drupal7-context.spec b/drupal7-context.spec
index e30aa23..b26da91 100644
--- a/drupal7-context.spec
+++ b/drupal7-context.spec
@@ -1,27 +1,26 @@
-%global drupalver 7
-%{?rhel: %{expand: %%global drupal drupal%%{drupalver}}}
-%if 0%{?fedora} >= 15
-%global drupal drupal%{drupalver}
-%endif
-%{!?drupal: %{expand: %%global drupal drupal}}
-# e.g. "/usr/share/drupal7"
-%global drupaldir %{_datadir}/%{drupal}
-# Use upstream name as expressed in URL and tarball
-%global modname context
-
-Name: drupal%{drupalver}-%{modname}
-Version: 3.1
-Release: 1%{?dist}
-Summary: Allows you to manage contextual conditions and reactions of your site
-Group: Applications/Publishing
-License: GPLv2+
-URL: http://drupal.org/project/%{modname}
-Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: LICENSE.txt
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: %{drupal} >= 7.0, drupal7-ctools
+%{?drupal7_find_provides_and_requires}
+
+%global module context
+
+Name: drupal7-%{module}
+Version: 3.2
+Release: 1%{?dist}
+Summary: Allows contextual conditions and reactions management
+
+Group: Applications/Publishing
+License: GPLv2+
+URL: http://drupal.org/project/%{module}
+Source0: http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}.tar.gz
+Source1: %{name}-RPM-README.txt
+
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+Requires: drupal7-ctools
+#Requires: drupal7(ctools)
+# phpcompatinfo (computed from version 3.2)
+Requires: php-pcre
%description
Context allows you to manage contextual conditions and reactions for different
@@ -34,20 +33,28 @@ Think of conditions as a set of rules that are checked during page load to see
what context is active. Any reactions that are associated with active contexts
are then fired.
+This package provides the following Drupal modules:
+* %{module}
+* %{module}_layouts
+* %{module}_ui
+
%prep
-%setup -qn context
+%setup -qn %{module}
+cp -p %{SOURCE1} .
-install -p -m 0644 %{SOURCE1} .
+# Remove executable bit
+chmod a-x LICENSE.txt
%build
-cp %{SOURCE2} .
+# Empty build section, nothing to build
+
%install
rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/context
-cp -pr * %{buildroot}%{drupaldir}/modules/context
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
%clean
@@ -56,14 +63,16 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-# Remember to include other documentation text here as well
-%doc LICENSE.txt %{name}-fedora-README.txt
-# Remember to exclude all documentation texts from above
-%exclude %{drupaldir}/modules/%{modname}/LICENSE.txt
-%exclude %{drupaldir}/modules/%{modname}/%{name}-fedora-README.txt
-%{drupaldir}/modules/%{modname}
+%doc *.txt
+%{drupal7_modules}/%{module}
+%exclude %{drupal7_modules}/%{module}/*.txt
+
%changelog
+* Sat Feb 15 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 3.2-1
+- Updated to 3.2 (BZ #1059560; release notes https://drupal.org/node/2183729)
+- Spec cleanup
+
* Fri Nov 08 2013 Peter Borsa <peter.borsa at gmail.com> - 3.1-1
- Update to upstream 3.1 release for bug fixes
- Upstream changelog for this release: https://drupal.org/node/2113785
diff --git a/sources b/sources
index d3c4769..ebadbd4 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
0211b9782b18364623ac044f1aa39295 context-7.x-3.1.tar.gz
+a9ee5d6eb6c1d7980f4834788e5e20f0 context-7.x-3.2.tar.gz
More information about the scm-commits
mailing list