[drupal7-feeds] Spec cleanup

[Shawn Iwinski]

commit 578673c163341519e4c21e5e3dabccb6dd2d943a
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sat Oct 18 11:06:19 2014 -0400

    Spec cleanup

 LICENSE.txt                     |  339 ---------------------------------------
 drupal7-feeds-fedora-README.txt |    6 -
 drupal7-feeds.spec              |   88 +++++++----
 3 files changed, 57 insertions(+), 376 deletions(-)
---
diff --git a/drupal7-feeds.spec b/drupal7-feeds.spec
index 9078593..7f3c39e 100644
--- a/drupal7-feeds.spec
+++ b/drupal7-feeds.spec
@@ -1,53 +1,79 @@
-%global drupaldir %{_datadir}/drupal7
-%global alphabeta alpha
-%global prerelease 8
-
-Name:    drupal7-feeds
-Version: 2.0
-Release: 0.9.%{alphabeta}%{prerelease}%{?dist}
-Summary: An import and aggregation framework for Drupal
-
-Group: Applications/Publishing
-License: GPLv2+
-URL:     http://drupal.org/project/feeds
-Source0: http://ftp.drupal.org/files/projects/feeds-7.x-%{version}-%{alphabeta}%{prerelease}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: LICENSE.txt
-
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  drupal7
-Requires:  drupal7-ctools >= 1.0-0.1.alpha4
-Requires:  drupal7-job_scheduler >= 2.0-0.1.alpha2
+%{?drupal7_find_provides_and_requires}
+
+%global module feeds
+%global prerelease alpha8
+
+Name:          drupal7-%{module}
+Version:       2.0
+Release:       0.10.%{prerelease}%{?dist}
+Summary:       Aggregates RSS/Atom/RDF feeds, imports CSV files and more
+
+Group:         Applications/Publishing
+License:       GPLv2+
+URL:           http://drupal.org/project/%{module}
+Source0:       http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}-%{prerelease}.tar.gz
+
+BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+Requires:      drupal7-ctools
+#Requires:      drupal7(ctools)
+Requires:      drupal7(job_scheduler)
+
+# phpcompatinfo (computed from version 2.0-alpha8)
+Requires:      php-curl
+Requires:      php-date
+Requires:      php-hash
+Requires:      php-libxml
+Requires:      php-pcre
+Requires:      php-session
+Requires:      php-simplexml
+
 
 %description
-Import or aggregate data as nodes, users,
-taxonomy terms or simple database records.
+Import or aggregate data as nodes, users, taxonomy terms or simple database
+records.
+
+This package provides the following Drupal modules:
+* %{module}
+* %{module}_import
+* %{module}_news
+* %{module}_ui
 
 %prep
+%setup -qn %{module}
 
-%setup -qn feeds
+# Remove executable bits
+find . -type f -perm /+x -print0 | xargs -0 chmod -x
 
-install -p -m 0644 %{SOURCE1} .
-install -p -m 0644 %{SOURCE2} .
 
 %build
+# Empty build section, nothing to build
+
 
 %install
 rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/feeds
-cp -pr * %{buildroot}%{drupaldir}/modules/feeds
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt LICENSE.txt README.txt %{name}-fedora-README.txt
-%{drupaldir}/modules/feeds
-%exclude %{drupaldir}/modules/feeds/*.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.txt
+%doc README.txt CHANGELOG.txt
+%{drupal7_modules}/%{module}
+
 
 %changelog
+* Sat Oct 18 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.0-0.10.alpha8
+- Spec cleanup
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.9.alpha8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild