[BackupPC/f14: 33/34] Merge branch 'master' into f14

[Bernard Johnson]

commit c62315be763998bec99487089ff1de82304580d9
Merge: 1752b4c 7f050ba
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 29 15:58:04 2011 -0600

    Merge branch 'master' into f14
    
    Conflicts:
    	BackupPC.spec

 .gitignore                    |    1 +
 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                 |  226 ++++++++++++++++++++++++++++++++---------
 BackupPC.tmpfiles             |    1 +
 backuppc.service              |   13 +++
 sources                       |    2 +-
 10 files changed, 293 insertions(+), 69 deletions(-)
---
diff --cc BackupPC.spec
index acdc292,15398a2..781883c
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@@ -5,8 -7,8 +7,13 @@@
  %endif
  
  Name:           BackupPC
++<<<<<<< HEAD
 +Version:        3.1.0
 +Release:        16%{?dist}
++=======
+ Version:        3.2.1
+ Release:        1%{?dist}
++>>>>>>> master
  Summary:        High-performance backup system
  
  Group:          Applications/System
@@@ -18,31 -23,39 +28,54 @@@ Source2:        BackupPC.logrotat
  Source3:        BackupPC-README.fedora
  #A C wrapper to use since perl-suidperl is no longer provided
  Source4:        BackupPC_Admin.c
++<<<<<<< HEAD
 +Patch0:         BackupPC-TopDir_change.patch
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +# No longer noarch due to the C wrapper
 +#BuildArch:      noarch
++=======
+ Source5:        backuppc.service
+ Source6:        BackupPC.tmpfiles
  
- BuildRequires:  /bin/cat
- BuildRequires:  /bin/df
- BuildRequires:  /bin/gtar
- BuildRequires:  %{_bindir}/nmblookup
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
++>>>>>>> master
+ 
+ BuildRequires:  /bin/cat, /bin/df, /bin/gtar
+ BuildRequires:  %{_bindir}/smbclient, %{_bindir}/nmblookup
  BuildRequires:  %{_bindir}/rsync
  BuildRequires:  %{_sbindir}/sendmail
  BuildRequires:  %{_bindir}/split
  BuildRequires:  %{_bindir}/ssh
  BuildRequires:  perl(Compress::Zlib)
+ %if 0%{?_with_systemd}
+ BuildRequires:  systemd-units
+ %endif
+ 
+ # Unbundled libraries
+ Requires:       perl(Net::FTP::AutoReconnect), perl(Net::FTP::RetrHandle)
  
  Requires:       httpd
++<<<<<<< HEAD
 +Requires:       perl(File::RsyncP)
 +Requires:       perl(Compress::Zlib)
 +Requires:       perl(Archive::Zip)
 +Requires:       perl-Time-modules
 +Requires:       perl(XML::RSS)
++=======
+ Requires:       perl(File::RsyncP), perl(Compress::Zlib), perl(Archive::Zip)
+ Requires:       perl-Time-modules, perl(XML::RSS)
++>>>>>>> master
  Requires:       rsync
- Requires:       samba-client
+ # This is a file dependency so EL5 can use samba or samba-client or
+ # samba3x-client
+ Requires:       %{_bindir}/smbclient, %{_bindir}/nmblookup
+ 
  Requires(pre):  %{_sbindir}/useradd
+ %if 0%{?_with_systemd}
+ Requires(preun): systemd-units
+ Requires(post):  systemd-units, %{_sbindir}/usermod
+ Requires(postun): systemd-units
+ %else
  Requires(preun): initscripts, chkconfig
  Requires(post): initscripts, chkconfig, %{_sbindir}/usermod
  Requires(postun): initscripts
@@@ -99,13 -120,21 +140,25 @@@ EO
  
  cat >%{name}.fc <<EOF
  %{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
- %{_localstatedir}/log/%{name}(/.*)?     gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ %{_localstatedir}/run/%{name}(/.*)?     gen_context(system_u:object_r:var_run_t,s0)
  EOF
+ popd
  %endif
  
+ # attempt to unbundle as much as possible
+ for m in Net/FTP; do
+   rm -rf lib/$m
+   pwd; ls -l
+   sed -i "\@lib/$m at d" configure.pl 
+ done
+ 
  %build
  gcc -o BackupPC_Admin BackupPC_Admin.c $RPM_OPT_FLAGS
++<<<<<<< HEAD
 +%if %{useselinux}
++=======
+ %if ! 0%{?_without_selinux}
++>>>>>>> master
       # SElinux 
       pushd selinux
       make -f %{_datadir}/selinux/devel/Makefile
@@@ -156,10 -193,10 +217,17 @@@ sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{Cg
  sed -i 's|ClientNameAlias           => 1,|ClientNameAlias           => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
  
  #perl-suidperl is no longer avaialable, we use a C wrapper
++<<<<<<< HEAD
 +%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl
 +%{__install} -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/
 +
 +%if %{useselinux}
++=======
+ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/BackupPC_Admin.pl
+ install -p BackupPC_Admin $RPM_BUILD_ROOT%{_datadir}/%{name}/sbin/
+ 
+ %if ! 0%{?_without_selinux}
++>>>>>>> master
       # SElinux 
       %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}
       %{__install} -m644 selinux/%{name}.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/%{name}.pp
@@@ -232,6 -310,26 +341,29 @@@ f
  %endif
  
  %changelog
++<<<<<<< HEAD
++=======
+ * 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 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
+ 
++>>>>>>> master
  * Mon Aug 02 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-16
  - Debugingo with no sources (fix bug #620257)