[drupal7-date_ical] Updated to 3.2 (BZ #1103436)

Shawn Iwinski siwinski at fedoraproject.org
Fri Jun 27 20:49:02 UTC 2014


commit 40b8809cd79768e4a6a8e71d0cf57ab9dd464ece
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date:   Fri Jun 27 01:11:10 2014 -0400

    Updated to 3.2 (BZ #1103436)
    
    - Release notes: https://www.drupal.org/node/2277339
    - Spec cleanup

 .gitignore                                         |    1 +
 drupal7-date_ical-LICENSE.txt                      |  339 --------------------
 ...-README.txt => drupal7-date_ical-RPM-README.txt |    0
 drupal7-date_ical.spec                             |  119 ++++---
 sources                                            |    2 +-
 5 files changed, 67 insertions(+), 394 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 474f043..689c4ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /date_ical-7.x-2.12.tar.gz
 /date_ical-7.x-3.0.tar.gz
 /date_ical-7.x-3.1.tar.gz
+/date_ical-7.x-3.2.tar.gz
diff --git a/drupal7-date_ical-fedora-README.txt b/drupal7-date_ical-RPM-README.txt
similarity index 100%
rename from drupal7-date_ical-fedora-README.txt
rename to drupal7-date_ical-RPM-README.txt
diff --git a/drupal7-date_ical.spec b/drupal7-date_ical.spec
index d47426a..f296342 100644
--- a/drupal7-date_ical.spec
+++ b/drupal7-date_ical.spec
@@ -1,70 +1,81 @@
-%global drupalver 7
-%{?rhel: %{expand: %%global drupal drupal%%{drupalver}}}
-%if 0%{?fedora} >= 15
-%global drupal drupal%{drupalver}
-%endif
-%{!?drupal: %{expand: %%global drupal drupal}}
-# e.g. "/usr/share/drupal7"
-%global drupaldir %{_datadir}/%{drupal}
-# Use upstream name as expressed in URL and tarball
-%global modname date_ical
-
-Name:    drupal%{drupalver}-%{modname}
-Version: 3.1
-Release: 2%{?dist}
-Summary: Allows creation of an iCal feed in Views
-Group:   Applications/Publishing
-License: GPLv2+
-URL:     http://drupal.org/project/%{modname}
-Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}.tar.gz
-Source1: %{name}-fedora-README.txt
-Source2: %{name}-LICENSE.txt
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:  %{drupal} >= 7.0
-Requires:  drupal7-date
-Requires:  drupal7-entity
-Requires:  drupal7-views >= 3.5
+%{?drupal7_find_provides_and_requires}
+
+%global module date_ical
+
+Name:          drupal7-%{module}
+Version:       3.2
+Release:       1%{?dist}
+Summary:       Enables import/export of iCal feeds
+
+Group:         Applications/Publishing
+License:       GPLv2+
+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
+BuildRequires: drupal7-rpmbuild >= 7.23-3
+
+# date_ical.info
+# Since Drupal 7 itself only requires PHP >= 5.2.4, we must must specify greater PHP min ver
+Requires:      php(language) >= 5.3.0
+Requires:      drupal7-date
+#Requires:      drupal7(date)
+#Requires:      drupal7(date_api)
+#Requires:      drupal7(date_views)
+Requires:      drupal7(entity)
+Requires:      drupal7(libraries) >= 2.0
+Requires:      drupal7-views >= 3.5
+#Requires:      drupal7(views) >= 3.5
+# date_ical.info: optional
+Requires:      drupal7-feeds
+#Requires:      drupal7(feeds)
+# phpcompatinfo (computed from version 3.2)
+Requires:      php-date
+Requires:      php-json
+Requires:      php-pcre
 
 %description
-This module contains code to create an iCal feed in Views.
-It has been pulled out of the Calendar iCal module because
-it has no dependency on Calendar and
-it could be used on any view.
-The code has also been generalized so that
-it will work for any entity, not just nodes.
-It creates an 'iCal' view mode for every entity type
-that can be used to to configure the description
-used in the iCal feed, and adds theme suggestions to
-tell Drupal to look for an iCal version of the entity template.
+Date iCal is your one-stop shop for iCal support in Drupal. It provides a
+plugin for Views to enable exporting your site's calendar as an iCal feed,
+and a plugin for Feeds to enable importing external iCal feeds into your
+site's calendar.
+
+Any entity which contains a Date field can be utilized by Date iCal for import
+and export of iCal feeds.
+
+This package provides the following Drupal module:
+* %{module}
+
 
 %prep
-%setup -qn %{modname}
+%setup -qn %{module}
+cp -p %{SOURCE1} .
+
+# Remove executable bit
+chmod a-x LICENSE.txt
+
 
 %build
-cp %{SOURCE1} .
-cp %{SOURCE2} ./LICENSE.txt
+# Empty build section, nothing to build
 
-%install
-rm -rf %{buildroot}
-install -d %{buildroot}%{drupaldir}/modules/%{modname}
-find . -type f -exec install -m 0644 -D '{}' %{buildroot}%{drupaldir}/modules/%{modname}/'{}' \;
 
+%install
+mkdir -pm 0755 %{buildroot}%{drupal7_modules}/%{module}
+cp -pr * %{buildroot}%{drupal7_modules}/%{module}/
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-# Remember to include other documentation text here as well
-%doc LICENSE.txt %{name}-fedora-README.txt README.txt
-# Remember to exclude all documentation texts from above
-%exclude %{drupaldir}/modules/%{modname}/LICENSE.txt
-%exclude %{drupaldir}/modules/%{modname}/README.txt
-%exclude %{drupaldir}/modules/%{modname}/%{name}-fedora-README.txt
-%{drupaldir}/modules/%{modname}
+%doc *.txt
+%{drupal7_modules}/%{module}
+%exclude %{drupal7_modules}/%{module}/*.txt
+
 
 %changelog
+* Fri Jun 27 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 3.2-1
+- Updated to 3.2 (BZ #1103436; release notes https://www.drupal.org/node/2277339)
+- Spec cleanup
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index d0910db..b6037c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e28346088e58dce49ca38bcdebcc8cf  date_ical-7.x-3.1.tar.gz
+47d374ec195250426ae799c2aaa93624  date_ical-7.x-3.2.tar.gz


More information about the scm-commits mailing list