diff --git a/.gitignore b/.gitignore index 3353e94..be0f3da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /features_extra-7.x-1.0-beta1.tar.gz +/features_extra-7.x-1.0.tar.gz diff --git a/drupal7-features_extra-RPM-README.txt b/drupal7-features_extra-RPM-README.txt deleted file mode 100644 index e15a506..0000000 --- a/drupal7-features_extra-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-features_extra.spec b/drupal7-features_extra.spec index ba7981e..9b899c0 100644 --- a/drupal7-features_extra.spec +++ b/drupal7-features_extra.spec @@ -1,33 +1,29 @@ %{?drupal7_find_provides_and_requires} -%global module_name features_extra -%global pre_release beta1 +%global module features_extra -Name: drupal7-%{module_name} +Name: drupal7-%{module} Version: 1.0 -Release: 0.6.%{pre_release}%{?dist} +Release: 1%{?dist} Summary: Provides faux exportables of several site-building components 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}.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-features -#Requires: drupal7(ctools) -#Requires: drupal7(features) +Requires: drupal7(ctools) +Requires: drupal7(features) # NOTE: profile module is deprecated, and included in Drupal 7 for legacy # purposes only. While the core drupal7 package does include the HIDDEN # profile module, it does not virtually provide "drupal7(profile)". #Requires: drupal7(profile) -# phpci -Requires: php-pcre +# phpcompatinfo (computed from version 1.0) +# %description Features Extra provides faux exportables (via Features) of several @@ -40,8 +36,7 @@ This package provides the following Drupal modules: %prep -%setup -q -n %{module_name} -cp -p %{SOURCE1} . +%setup -q -n %{module} %build @@ -50,8 +45,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 @@ -60,12 +55,17 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc *.txt -%{drupal7_modules}/%{module_name} -%exclude %{drupal7_modules}/%{module_name}/*.txt +%{?_licensedir:%license LICENSE.txt} +%{drupal7_modules}/%{module} %changelog +* Sun Aug 16 2015 Shawn Iwinski - 1.0-1 +- Updated to 1.0 (RHBZ #1252867) +- %%license usage +- Keep documentation where end-users expect it +- Removed RPM README b/c it only explained common Drupal workflow + * Wed Jun 17 2015 Fedora Release Engineering - 1.0-0.6.beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 15b174c..558ccf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cf022b7a3ca1149815879280981cb3d features_extra-7.x-1.0-beta1.tar.gz +ecfa56304e61cc67d7c683ebbab36035 features_extra-7.x-1.0.tar.gz