[drupal7-token] Spec cleanup

Shawn Iwinski siwinski at fedoraproject.org
Sun Oct 19 03:53:56 UTC 2014


commit a9fe259d1ba158634b4781d10c60b93db86363eb
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Sat Oct 18 23:53:23 2014 -0400

    Spec cleanup

 LICENSE.txt                     |  339 ---------------------------------------
 drupal7-token-fedora-README.txt |    6 -
 drupal7-token.spec              |   73 ++++++---
 3 files changed, 46 insertions(+), 372 deletions(-)
---
diff --git a/drupal7-token.spec b/drupal7-token.spec
index fe15dc0..f0f2aa6 100644
--- a/drupal7-token.spec
+++ b/drupal7-token.spec
@@ -1,51 +1,70 @@
-%global drupaldir %{_datadir}/drupal7
+%{?drupal7_find_provides_and_requires}
 
-Name:    drupal7-token
-Version: 1.5
-Release: 3%{?dist}
-Summary: Provides a method for site designers to control content presentation
+%global module token
 
-Group: Applications/Publishing
-License: GPLv2+
-URL:     http://drupal.org/project/token
-Source0: http://ftp.drupal.org/files/projects/token-7.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: LICENSE.txt
+Name:          drupal7-%{module}
+Version:       1.5
+Release:       4%{?dist}
+Summary:       Provides a user interface for the Token API and some missing core tokens
 
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  drupal7
+Group:         Applications/Publishing
+License:       GPLv2+
+URL:           http://drupal.org/project/%{module}
+Source0:       http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}.tar.gz
+
+BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+# phpcompatinfo (computed from version 1.5)
+Requires:      php-date
+Requires:      php-filter
+Requires:      php-hash
+Requires:      php-pcre
 
 %description
-Tokens are small bits of text that can be placed into larger documents
-via simple placeholders.
-The Token module provides a central API for modules to use these tokens,
-and expose their own token values.
+Tokens are small bits of text that can be placed into larger documents via
+simple placeholders, like %%site-name or [user]. The Token module provides
+a central API for modules to use these tokens, and expose their own token
+values.
 
-%prep
+Note that Token module doesn't provide any visible functions to the user
+on its' own, it just provides token handling services for other modules.
 
-%setup -qn token
+This package provides the following Drupal module:
+* %{module}
+
+
+%prep
+%setup -qn %{module}
 
-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/token
-cp -pr * %{buildroot}%{drupaldir}/modules/token
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.txt README.txt %{name}-fedora-README.txt
-%{drupaldir}/modules/token
-%exclude %{drupaldir}/modules/token/*.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.txt
+%doc README.txt
+%{drupal7_modules}/%{module}
+
 
 %changelog
+* Sat Oct 18 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.5-4
+- Spec cleanup
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list