[drupal7-votingapi] Updated to 2.12 (BZ #1130011)

Shawn Iwinski siwinski at fedoraproject.org
Sun Aug 31 04:07:32 UTC 2014


commit dbc884f4ecefc1950d704bfe96c480e3f951a1a5
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sun Aug 31 00:06:58 2014 -0400

    Updated to 2.12 (BZ #1130011)
    
    - Release notes: https://www.drupal.org/node/2321111)
    - Spec cleannup

 .gitignore                          |    1 +
 drupal7-votingapi-LICENSE.txt       |  339 -----------------------------------
 drupal7-votingapi-RPM-README.txt    |    5 +
 drupal7-votingapi-fedora-README.txt |    6 -
 drupal7-votingapi.spec              |   78 +++++----
 sources                             |    2 +-
 6 files changed, 48 insertions(+), 383 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d3784c..b47b8dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /votingapi-7.x-2.9.tar.gz
 /votingapi-7.x-2.10.tar.gz
 /votingapi-7.x-2.11.tar.gz
+/votingapi-7.x-2.12.tar.gz
diff --git a/drupal7-votingapi-RPM-README.txt b/drupal7-votingapi-RPM-README.txt
new file mode 100644
index 0000000..e15a506
--- /dev/null
+++ b/drupal7-votingapi-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-votingapi.spec b/drupal7-votingapi.spec
index fd96860..de8cf61 100644
--- a/drupal7-votingapi.spec
+++ b/drupal7-votingapi.spec
@@ -1,27 +1,21 @@
-%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 votingapi
-
-Name:    drupal%{drupalver}-%{modname}
-Version: 2.11
-Release: 2%{?dist}
-Summary: Drupal Standardized API and schema for storing, retrieving, and tabulating votes
-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: %{name}-LICENSE.txt
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  %{drupal} >= 7.0
+%{?drupal7_find_provides_and_requires}
+
+%global module votingapi
+
+Name:          drupal7-%{module}
+Version:       2.12
+Release:       1%{?dist}
+Summary:       Provides a shared voting API for other modules
+
+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
 
 %description
 VotingAPI helps developers who want to use a standardized API and schema for
@@ -41,35 +35,45 @@ Note that this module does NOT directly expose any voting mechanisms to end
 users. It's a framework designed to make life easier for other developers,
 and to standardize voting data for consumption by other modules (like Views).
 
-For some examples of simple voting systems based on VotingAPI, check Is Useful,
-Fivestar, and Plus1.
+For some examples of simple voting systems based on VotingAPI, check
+Is Useful [1], Fivestar [2], and Plus1 [3].
+
+[1] http://drupal.org/project/is_useful
+[2] http://drupal.org/project/fivestar
+[3] http://drupal.org/project/plus1
+
 
 %prep
-%setup -qn %{modname}
+%setup -qn %{module}
+cp -p %{SOURCE1} .
+
 
 %build
-cp %{SOURCE1} .
-cp %{SOURCE2} ./LICENSE.txt
+# Empty build section, nothing to build
+
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/%{modname}
-find . -type f -exec install -m 0644 -D '{}' %{buildroot}%{drupaldir}/modules/%{modname}/'{}' \;
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
 
 
 %clean
 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
+* Sun Aug 31 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.12-1
+- Updated to 2.12 (BZ #1130011; release notes https://www.drupal.org/node/2321111)
+- Spec cleannup
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 8b0273f..dfe655c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbc90109102e156bfea046d15bc59122  votingapi-7.x-2.11.tar.gz
+af36516e151719c7b7e9d4edb51bf045  votingapi-7.x-2.12.tar.gz


More information about the scm-commits mailing list