diff --git a/.gitignore b/.gitignore index 42a1267..e6d0d55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /file_entity-7.x-2.0-unstable7.tar.gz +/file_entity-7.x-2.0-beta3.tar.gz diff --git a/drupal7-file_entity-RPM-README.txt b/drupal7-file_entity-RPM-README.txt deleted file mode 100644 index e15a506..0000000 --- a/drupal7-file_entity-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-file_entity.spec b/drupal7-file_entity.spec index 116d8c8..38de736 100644 --- a/drupal7-file_entity.spec +++ b/drupal7-file_entity.spec @@ -1,29 +1,28 @@ %{?drupal7_find_provides_and_requires} -%global module_name file_entity -%global pre_release unstable7 +%global module file_entity +%global pre_release beta3 -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: File entity (fieldable files) 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-ctools -#Requires: drupal7(ctools) +Requires: drupal7(ctools) Requires: drupal7(field) Requires: drupal7(file) -# phpci -Requires: php-spl +Requires: drupal7(system) >= 7.33 +# phpcompatinfo (computed from version 2.0-beta3) +Requires: php-date %description File entity provides interfaces for managing files. It also extends the core @@ -32,12 +31,16 @@ display modes) and formatted using field formatters. File entity integrates with a number of modules, exposing files to Views, Entity API, Token and more. This package provides the following Drupal module: -* %{module_name} +* %{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 @@ -46,8 +49,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 @@ -55,13 +58,17 @@ 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 +* Thu Aug 04 2016 Shawn Iwinski 2.0-0.7.beta3 +- Updated to 2.0-beta3 (RHBZ #1327692) +- Minor spec cleanup + * Wed Feb 03 2016 Fedora Release Engineering - 2.0-0.6.unstable7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 428b68e..174e8ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db2a9fe38cc77b43d624f4d4449ba1f0 file_entity-7.x-2.0-unstable7.tar.gz +8b4bc344ca2e309f19b97668e852aa4b file_entity-7.x-2.0-beta3.tar.gz