[BackupPC/f13: 37/37] Merge branch 'master' into f13

[Bernard Johnson]

commit 6a30f3cc469d40a3b89961e4c4a1454a8675caaa
Merge: 9fc1ce4 7f050ba
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 29 17:22:09 2011 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	BackupPC.spec

 BackupPC-3.2.1-locatedb.patch |   37 +++++++
 BackupPC-3.2.1-piddir.patch   |   36 ++++++
 BackupPC-3.2.1-rundir.patch   |   24 ++++
 BackupPC-TopDir_change.patch  |   21 ----
 BackupPC.htaccess             |    1 +
 BackupPC.spec                 |  238 +++++++++++++++++++++++++++++++----------
 BackupPC.tmpfiles             |    1 +
 BackupPC_Admin.c              |   10 ++
 backuppc.service              |   13 +++
 sources                       |    2 +-
 10 files changed, 302 insertions(+), 81 deletions(-)
---
diff --cc BackupPC.spec
index fea8f62,15398a2..bc68b90
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@@ -223,12 -310,38 +310,45 @@@ f
  %endif
  
  %changelog
+ * Fri Jul 08 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.2.1-1
+ - v 3.2.1
+ - add lower case script URL alias for typing impaired
+ - cleanup selinux macros
+ - spec cleanup
+ - make samba dependency on actual files required to EL5 can use samba-client
+   or samba3x-client (bz #667479)
+ - unbundle perl(Net::FTP::AutoReconnect) and perl(Net::FTP::RetrHandle)
+ - remove old patch that is no longer needed
+ - attempt to make sure $Conf{TopDir} is listed in updatedb PRUNEPATHS,
+   otherwise at least generate a warning on statup (bz #554491)
+ - move sockets to /var/run (bz #719499)
+ - add support for systemd starting at F16 (bz #699441)
+ - patch to move pid dir under /var/run
+ - unbundle Net::FTP::*
+ - add support for tmpfiles.d
+ 
 +* Mon May 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-14
 +- Fix for bug #592762
 +
 +* Mon Mar 29 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-13
 +- Rebuild agaisnt latest selinux policy (bug #577389)
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-17
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Mon Aug 02 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-16
+ - Debugingo with no sources (fix bug #620257)
+ 
+ * Sat Jul 31 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-15
+ - perl-suidperl is no longer available (fix bug #611009)
+ 
+ * Fri Jul 09 2010 Mike McGrath <mmcgrath at redhat.com> 3.1.0-14.1
+ - Rebuilding to fix perl-suidperl broken dep
+ 
+ * Mon May 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-14
+ - Fix for bug #592762
+ 
++>>>>>>> master
  * Sun Feb 28 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-12
  - Add "::1" to the apache config file for default allowed adresses
  - Fix a typo in the apache config file