[BackupPC/f14: 34/34] merge from master

[Bernard Johnson]

commit 9e9998ec2f98657558d440cac647aafa6c6bd6e3
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Fri Jul 29 16:00:32 2011 -0600

    merge from master

 BackupPC.spec |   34 ----------------------------------
 1 files changed, 0 insertions(+), 34 deletions(-)
---
diff --git a/BackupPC.spec b/BackupPC.spec
index 781883c..15398a2 100644
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@ -7,13 +7,8 @@
 %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
@@ -28,17 +23,10 @@ Source2:        BackupPC.logrotate
 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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
->>>>>>> master
 
 BuildRequires:  /bin/cat, /bin/df, /bin/gtar
 BuildRequires:  %{_bindir}/smbclient, %{_bindir}/nmblookup
@@ -55,16 +43,8 @@ BuildRequires:  systemd-units
 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
 # This is a file dependency so EL5 can use samba or samba-client or
 # samba3x-client
@@ -154,11 +134,7 @@ 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
@@ -217,17 +193,10 @@ sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/%{name}";|' $RP
 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
@@ -341,8 +310,6 @@ fi
 %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
@@ -363,7 +330,6 @@ fi
 * 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)