[drupal7-link] Updated to 1.3 (BZ #1155470)

Shawn Iwinski siwinski at fedoraproject.org
Mon Nov 10 05:08:53 UTC 2014


commit e56a1360aa3410cdc9abd3e8ca06af308b548360
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Mon Nov 10 00:08:15 2014 -0500

    Updated to 1.3 (BZ #1155470)
    
    - Removed RPM README b/c it only explained common Drupal workflow
    - %license usage

 .gitignore                  |    1 +
 drupal7-link-RPM-README.txt |    5 -----
 drupal7-link.spec           |   43 +++++++++++++++++++++++--------------------
 sources                     |    2 +-
 4 files changed, 25 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a26cf21..705f888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /link-7.x-1.1.tar.gz
 /link-7.x-1.2.tar.gz
+/link-7.x-1.3.tar.gz
diff --git a/drupal7-link.spec b/drupal7-link.spec
index d7f4157..3448bf5 100644
--- a/drupal7-link.spec
+++ b/drupal7-link.spec
@@ -1,23 +1,22 @@
 %{?drupal7_find_provides_and_requires}
 
-%global module_name link
+%global module link
 
-Name:          drupal7-%{module_name}
-Version:       1.2
-Release:       2%{?dist}
+Name:          drupal7-%{module}
+Version:       1.3
+Release:       1%{?dist}
 Summary:       Defines simple link field types
 
 Group:         Applications/Publishing
 License:       GPLv2+
-URL:           http://drupal.org/project/%{module_name}
-Source0:       http://ftp.drupal.org/files/projects/%{module_name}-7.x-%{version}.tar.gz
-Source1:       %{name}-RPM-README.txt
+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.22-5
+BuildRequires: drupal7-rpmbuild >= 7.23-3
 
-# phpci
+# phpcompatinfo (computed from version 1.3)
 Requires:      php-pcre
 
 %description
@@ -30,12 +29,11 @@ title attributes, target attributes, CSS class attribution, static repeating
 values, input conversion, and many more.
 
 This package provides the following Drupal module:
-* %{module_name}
+* %{module}
 
 
 %prep
-%setup -q -n %{module_name}
-cp -p %{SOURCE1} .
+%setup -qn %{module}
 
 
 %build
@@ -44,8 +42,8 @@ cp -p %{SOURCE1} .
 
 %install
 rm -rf %{buildroot}
-mkdir -p -m 0755 %{buildroot}%{drupal7_modules}/%{module_name}
-cp -pr * %{buildroot}%{drupal7_modules}/%{module_name}/
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
 
 
 %clean
@@ -54,24 +52,29 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc *.txt
-%{drupal7_modules}/%{module_name}
-%exclude %{drupal7_modules}/%{module_name}/*.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.txt
+%{drupal7_modules}/%{module}
 
 
 %changelog
+* Sun Nov 09 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.3-1
+- Updated to 1.3 (BZ #1155470)
+- Removed RPM README b/c it only explained common Drupal workflow
+- %%license usage
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Thu Nov 28 2013 Peter Borsa <peter.borsa at gmail.com> 1.2-1
+* Thu Nov 28 2013 Peter Borsa <peter.borsa at gmail.com> - 1.2-1
 - Update to upstream 1.2 release for bugfixes
 - Upstream changelog for this release is available at https://drupal.org/node/2143271
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Sun Jun 16 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1-2
+* Sun Jun 16 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1-2
 - Updated for drupal7-rpmbuild 7.22-5
 
-* Mon Apr 15 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.1-1
+* Mon Apr 15 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.1-1
 - Initial package
diff --git a/sources b/sources
index 30c7968..d594cba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-100c0b2416d455908a818f0a547e9938  link-7.x-1.2.tar.gz
+cc9ccec6ca028f73cf60f8cab09e5a4d  link-7.x-1.3.tar.gz


More information about the scm-commits mailing list