From 434d4dceb031422c953a57be24d3081dd4cebd4f Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Jul 20 2014 14:21:39 +0000 Subject: Updated to 1.2 (BZ #1114975) - Release notes: https://www.drupal.org/node/2295431 --- diff --git a/.gitignore b/.gitignore index 35b6b15..dabda2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /boxes-7.x-1.1.tar.gz +/boxes-7.x-1.2.tar.gz diff --git a/drupal7-boxes.spec b/drupal7-boxes.spec index 7bb6115..fbbe2a4 100644 --- a/drupal7-boxes.spec +++ b/drupal7-boxes.spec @@ -1,27 +1,26 @@ %{?drupal7_find_provides_and_requires} -%global module_name boxes +%global module boxes -Name: drupal7-%{module_name} -Version: 1.1 -Release: 4%{?dist} +Name: drupal7-%{module} +Version: 1.2 +Release: 1%{?dist} Summary: Provides exports for custom blocks and spaces integration 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 +URL: http://drupal.org/project/%{module} +Source0: http://ftp.drupal.org/files/projects/%{module}-7.x-%{version}.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-ctools #Requires: drupal7(ctools) -# phpci +# phpcompatinfo (computed from version 1.2) Requires: php-pcre -Requires: php-spl %description Boxes module is a re-implementation of the custom blocks (boxes) that the core @@ -38,12 +37,12 @@ the contents of blocks without going to an admin page. Boxes provides exportables for its blocks via the (required) Chaos tools module. This allows modules to provide blocks in code that can be overwritten in the UI. -This package provides the following Drupal modules: -* %{module_name} +This package provides the following Drupal module: +* %{module} %prep -%setup -q -n %{module_name} +%setup -qn %{module} cp -p %{SOURCE1} . @@ -53,8 +52,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 -m 0755 %{buildroot}%{drupal7_modules}/%{module} +cp -pr * %{buildroot}%{drupal7_modules}/%{module}/ %clean @@ -63,20 +62,25 @@ 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 +%doc README.txt +%{drupal7_modules}/%{module} +%exclude %{drupal7_modules}/%{module}/*.txt %changelog +* Sun Jul 20 2014 hawn Iwinski - 1.2-1 +- Updated to 1.2 (BZ #1114975; release notes https://www.drupal.org/node/2295431) + * Sat Jun 07 2014 Fedora Release Engineering - 1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Sun Jun 09 2013 Shawn Iwinski 1.1-2 +* Sun Jun 09 2013 Shawn Iwinski - 1.1-2 - Updated for drupal7-rpmbuild 7.22-5 -* Fri Mar 22 2013 Shawn Iwinski 1.1-1 +* Fri Mar 22 2013 Shawn Iwinski - 1.1-1 - Initial package diff --git a/sources b/sources index cbbe5cb..0b5e5a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8eb469eeeecbcdf95bacbd6f17428e1d boxes-7.x-1.1.tar.gz +f925708e3ec92408e21de1c6ac196544 boxes-7.x-1.2.tar.gz