[drupal6-imagecache_profiles/el6: 3/3] Merge branch 'master' into el6

[Peter Borsa]

commit bef6df845b059300a493f720528442a16e5dac9d
Merge: 74e0676 60c956c
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Nov 28 10:16:47 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	drupal6-imagecache_profiles.spec
    	sources

 .gitignore                       |    4 ++++
 drupal6-imagecache_profiles.spec |   27 +++++++++++++++++++++++++++
 sources                          |    4 ++++
 3 files changed, 35 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 22e5c03,752f4b4..0ff2fc4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  /imagecache_profiles-6.x-1.3.tar.gz
++<<<<<<< HEAD
++=======
+ /imagecache_profiles-6.x-1.4-rc1.tar.gz
++>>>>>>> master
diff --cc drupal6-imagecache_profiles.spec
index f07a613,7a5c7f4..f557b04
--- a/drupal6-imagecache_profiles.spec
+++ b/drupal6-imagecache_profiles.spec
@@@ -6,19 -6,20 +6,35 @@@
  %{!?drupal: %{expand: %%global drupal drupal}}
  # e.g. "/usr/share/drupal6"
  %global drupalbase           %{_datadir}/%{drupal}
++<<<<<<< HEAD
 +%global drupal_sites_all    %{drupalbase}/sites/all        
 +%global drupal_modules      %{drupal_sites_all}/modules
 +# Use upstream name as expressed in URL and tarball
 +%global modname             imagecache_profiles
 +
 +Name:    drupal%{drupalver}-%{modname}
 +Version: 1.3
 +Release: 3%{?dist}
++=======
+ %global drupal_sites_all    %{drupalbase}/sites/all
+ %global drupal_modules      %{drupal_sites_all}/modules
+ # Use upstream name as expressed in URL and tarball
+ %global modname             imagecache_profiles
+ %global pre_release         rc1
+ 
+ Name:    drupal%{drupalver}-%{modname}
+ Version: 1.4
+ Release: 0.1.%{pre_release}%{?dist}
++>>>>>>> master
  Summary: Image Cache Profiles Module for Drupal6
  Group:   Applications/Publishing
  License: GPLv2
  URL:     http://drupal.org/project/%{modname}
++<<<<<<< HEAD
 +Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}.tar.gz
++=======
+ Source0: http://ftp.drupal.org/files/projects/%{modname}-%{drupalver}.x-%{version}-%{pre_release}.tar.gz
++>>>>>>> master
  Source1: %{name}-fedora-README.txt
  Source2: LICENSE.txt
  BuildArch: noarch
@@@ -28,7 -29,7 +44,11 @@@ Requires:  drupal6, drupal6-imagecach
  %description
  ImageCache_Profiles module allows you to set user profile pictures that are
  consistent throughout your site and allows avatars on the user profile
++<<<<<<< HEAD
 +pages, nodes and comments to be a different size. 
++=======
+ pages, nodes and comments to be a different size.
++>>>>>>> master
  
  %prep
  %setup -qn %{modname}
@@@ -57,6 -58,10 +77,13 @@@ rm -rf %{buildroot
  %{drupal_modules}/%{modname}
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Thu Nov 28 2013 Peter Borsa <peter.borsa at gmail.com> - 1.4-0.1.rc1
+ - Update to upstream 1.4-rc1 release for bug fixes
+ - Upstream changelog for this release is available at https://drupal.org/node/1304356
+ 
++>>>>>>> master
  * Thu Jun 7 2012 Anderson Silva <ansilva at redhat.com> - 1.3-3
  - Update LICENSE.txt with FSF mailing address
  - Update description
diff --cc sources
index 97c348f,7488269..beceb01
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +5161c3ab2f2c30ab0f9dfbeaf2a5e17d  imagecache_profiles-6.x-1.3.tar.gz
++=======
+ ab5947d950d8258fa3856807df2387b0  imagecache_profiles-6.x-1.4-rc1.tar.gz
++>>>>>>> master