[drupal6-views_bulk_operations/f14: 2/2] Merge branch 'master' into f14

[Sven Lankes]

commit 787b132295665f5bf3bbdd39272b695962b41dce
Merge: 5c462b7 cd383ab
Author: Sven Lankes <sven at lank.es>
Date:   Thu Sep 22 22:00:52 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	drupal6-views_bulk_operations.spec

 .gitignore                         |    1 +
 drupal6-views_bulk_operations.spec |   23 +++++++++++++++++------
 sources                            |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index c0c1582,8d09f58..3ac6cbf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
 -/views_bulk_operations-6.x-1.10.tar.gz/views_bulk_operations-6.x-1.11.tar.gz
 +/views_bulk_operations-6.x-1.10.tar.gz
++/views_bulk_operations-6.x-1.11.tar.gz
diff --cc drupal6-views_bulk_operations.spec
index a645c51,ffb2e5d..1cc4f80
--- a/drupal6-views_bulk_operations.spec
+++ b/drupal6-views_bulk_operations.spec
@@@ -1,7 -1,7 +1,7 @@@
 -%global drupaldir %{_datadir}/drupal6
 +%global drupaldir %{_datadir}/drupal
  Name:      drupal6-views_bulk_operations
- Version:   1.10
- Release:   6%{?dist}
+ Version:   1.11
+ Release:   1%{?dist}
  Summary:   This module augments Views by allowing bulk operations to be executed
  
  Group:     Applications/Publishing
@@@ -42,14 -42,25 +42,25 @@@ rm -rf %{buildroot
  %doc LICENSE.txt %{name}-fedora-README.txt README.txt
  %exclude %{drupaldir}/modules/views_bulk_operations/*.txt
  %{drupaldir}/modules/views_bulk_operations
- %lang(ja) %{drupaldir}/modules/views_bulk_operations/translations/ja.po
- %lang(sv) %{drupaldir}/modules/views_bulk_operations/translations/*.sv.po
- %lang(fr) %{drupaldir}/modules/views_bulk_operations/translations/fr.po
  
  %changelog
- * Sun Feb 27 2011 Sven Lankes - 1.10-6
 -* Thu Sep 22 2011 Sven Lankes - 1.11-1
++* Thu Sep 22 2011 Sven Lankes <sven at lank.es> - 1.11-1
+ - update to latest upstream release
+ - fixes DRUPAL-SA-CONTRIB-2011-042 
+ - translations have been removed upstream
+ 
 -* Sun Feb 27 2011 Sven Lankes - 1.10-7
 -- Fix maintainer error - I worked on the wrong branch
++* Sun Feb 27 2011 Sven Lankes <sven at lank.es> - 1.10-6
 +- Fix requires for F14 where drupal 6 is still named drupal
  
 -* Sun Feb 27 2011 Sven Lankes - 1.10-6.2
++* Sun Feb 27 2011 Sven Lankes <sven at lank.es> - 1.10-6.2
+ - Also adjust drupaldir
+ 
 -* Sun Feb 27 2011 Sven Lankes - 1.10-6.1
++* Sun Feb 27 2011 Sven Lankes <sven at lank.es> - 1.10-6.1
+ - Fix requires for F14 where drupal6 ist still called drupal
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Fri Jan 28 2011 Peter Borsa <peter.borsa at gmail.com> - 1.10-5
  - Lang macro is corrected.