From e9765e9d978fc39ced9e6c136af58abacd60ce1d Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Aug 01 2016 16:44:24 +0000 Subject: Updated to 2.0-beta2 (RHBZ #1320349) - Removed %defattr - %license usage --- diff --git a/.gitignore b/.gitignore index 92e3c82..f10918e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /translation_overview-7.x-2.0-beta1.tar.gz +/translation_overview-7.x-2.0-beta2.tar.gz diff --git a/drupal7-translation_overview-RPM-README.txt b/drupal7-translation_overview-RPM-README.txt deleted file mode 100644 index e15a506..0000000 --- a/drupal7-translation_overview-RPM-README.txt +++ /dev/null @@ -1,5 +0,0 @@ -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-translation_overview.spec b/drupal7-translation_overview.spec index 4051f08..b588d58 100644 --- a/drupal7-translation_overview.spec +++ b/drupal7-translation_overview.spec @@ -1,26 +1,25 @@ %{?drupal7_find_provides_and_requires} -%global module_name translation_overview -%global pre_release beta1 +%global module translation_overview +%global pre_release beta2 -Name: drupal7-%{module_name} +Name: drupal7-%{module} Version: 2.0 -Release: 0.6.%{pre_release}%{?dist} +Release: 0.7%{?pre_release:.%{pre_release}}%{?dist} Summary: Provides an overview of the translation status of site's content 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 +URL: http://drupal.org/project/%{module} +Source0: http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}%{?pre_release:-%{pre_release}}.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 Requires: drupal7(translation) -# phpci -Requires: php-pcre +# phpcompatinfo (computed from version 2.0-beta2) +# %description The Translation Overview page provides a table listing the site's nodes and @@ -30,13 +29,17 @@ priorities for translating nodes into the various languages. For translations of taxonomy terms and menu items check out the Translation table (http://drupal.org/project/translation_table) module. -This package provides the following Drupal modules: -* %{module_name} +This package provides the following Drupal module: +* %{module} %prep -%setup -q -n %{module_name} -cp -p %{SOURCE1} . +%setup -q -n %{module} + +: Licenses and docs +mkdir -p .rpm/{licenses,docs} +mv LICENSE.txt .rpm/licenses/ +#mv *.txt .rpm/docs/ %build @@ -45,8 +48,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 -p %{buildroot}%{drupal7_modules}/%{module} +cp -pr * %{buildroot}%{drupal7_modules}/%{module}/ %clean @@ -54,13 +57,18 @@ rm -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc *.txt -%{drupal7_modules}/%{module_name} -%exclude %{drupal7_modules}/%{module_name}/*.txt +%{!?_licensedir:%global license %%doc} +%license .rpm/licenses/* +#%%doc .rpm/docs/* +%{drupal7_modules}/%{module} %changelog +* Mon Aug 01 2016 Shawn Iwinski 2.0-0.7.beta2 +- Updated to 2.0-beta2 (RHBZ #1320349) +- Removed %%defattr +- %%license usage + * Wed Feb 03 2016 Fedora Release Engineering - 2.0-0.6.beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7426a96..9877318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -630815f9472fb23c4bcce1db0e550bbd translation_overview-7.x-2.0-beta1.tar.gz +2fc2e8edc9d9e0745da275edcae6ef59 translation_overview-7.x-2.0-beta2.tar.gz