[drupal7-entity_translation] Updated to 1.0-beta4 (BZ #1185294)

Shawn Iwinski siwinski at fedoraproject.org
Tue Jan 27 23:20:21 UTC 2015


commit 22d336195de6460f334957e27055ebc3c30514e6
Author: Shawn Iwinski <siwinski at redhat.com>
Date:   Tue Jan 27 18:19:52 2015 -0500

    Updated to 1.0-beta4 (BZ #1185294)
    
    - Moved RPM README inside spec
    - %license usage

 .gitignore                                |    1 +
 drupal7-entity_translation-RPM-README.txt |    5 ---
 drupal7-entity_translation.spec           |   39 ++++++++++++++++++++---------
 sources                                   |    2 +-
 4 files changed, 29 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00cb096..fd05001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /entity_translation-7.x-1.0-beta2.tar.gz
 /entity_translation-7.x-1.0-beta3.tar.gz
+/entity_translation-7.x-1.0-beta4.tar.gz
diff --git a/drupal7-entity_translation.spec b/drupal7-entity_translation.spec
index b2f7b6b..4dae3ce 100644
--- a/drupal7-entity_translation.spec
+++ b/drupal7-entity_translation.spec
@@ -1,32 +1,29 @@
 %{?drupal7_find_provides_and_requires}
 
 %global module_name entity_translation
-%global pre_release beta3
+%global pre_release beta4
 
 Name:          drupal7-%{module_name}
 Version:       1.0
-Release:       0.5.%{pre_release}%{?dist}
+Release:       0.6.%{pre_release}%{?dist}
 Summary:       Allows entities to be translated into different languages
 
 Group:         Applications/Publishing
 License:       GPLv2+
 URL:           http://drupal.org/project/%{module_name}
 Source0:       http://ftp.drupal.org/files/projects/%{module_name}-7.x-%{version}-%{pre_release}.tar.gz
-Source1:       %{name}-RPM-README.txt
 
 BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: drupal7-rpmbuild >= 7.22-5
+BuildRequires: drupal7-rpmbuild >= 7.23-3
 
 Requires:      drupal7-i18n
 #Requires:      drupal7(i18n)
 #Requires:      drupal7(i18n_menu)
 Requires:      drupal7(locale)
-# phpci
+# phpcompatinfo (computed from version 1.0-beta4)
 Requires:      php-date
 Requires:      php-pcre
-Requires:      php-pdo
-Requires:      php-spl
 
 %description
 Allows (fieldable) entities to be translated into different languages,
@@ -46,8 +43,16 @@ This package provides the following Drupal modules:
 
 
 %prep
-%setup -q -n %{module_name}
-cp -p %{SOURCE1} .
+%setup -qn %{module_name}
+
+# Create RPM README
+cat > RPM-README.txt <<'RPM_README'
+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.
+RPM_README
 
 
 %build
@@ -66,12 +71,22 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc *.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE.txt
+%doc CHANGELOG.txt
+%doc MAINTAINERS.txt
+%doc README.txt
+%doc RPM-README.txt
 %{drupal7_modules}/%{module_name}
 %exclude %{drupal7_modules}/%{module_name}/*.txt
 
 
 %changelog
+* Tue Jan 27 2015 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.0-0.6.beta4
+- Updated to 1.0-beta4 (BZ #1185294)
+- Moved RPM README inside spec
+- %%license usage
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.5.beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -82,8 +97,8 @@ rm -rf %{buildroot}
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.3.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Sun Jun 16 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.0-0.2.beta2
+* Sun Jun 16 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.0-0.2.beta2
 - Updated for drupal7-rpmbuild 7.22-5
 
-* Fri May 03 2013 Shawn Iwinski <shawn.iwinski at gmail.com> 1.0-0.1.beta2
+* Fri May 03 2013 Shawn Iwinski <shawn.iwinski at gmail.com> - 1.0-0.1.beta2
 - Initial package
diff --git a/sources b/sources
index cd66308..a0ecfa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ac4a62b82f9af44acb1950b9dd1ce2d  entity_translation-7.x-1.0-beta3.tar.gz
+81fdbd18abb8dc80e81c09deda8e320d  entity_translation-7.x-1.0-beta4.tar.gz


More information about the scm-commits mailing list