[bacula/el5] Removed commented stuff that will never come back
Simone Caronni
slaanesh at fedoraproject.org
Wed Jul 18 13:04:12 UTC 2012
commit 893e49e1b3086ed36458b4f73959fcdb2928aa4c
Author: Simone Caronni <negativo17 at gmail.com>
Date: Wed Jul 18 14:20:10 2012 +0200
Removed commented stuff that will never come back
bacula.spec | 81 ++--------------------------------------------------------
1 files changed, 3 insertions(+), 78 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index f728980..376827b 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -14,7 +14,6 @@ License: GPL
Group: System Environment/Daemons
Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2
-#Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz
Source3: bacula-gconsole.desktop
Source4: bacula-wxconsole.desktop
Source5: bacula-traymonitor.desktop
@@ -22,20 +21,9 @@ Source6: bacula.logrotate
Source7: bacula-fd.init
Source8: bacula-dir.init
Source9: bacula-sd.init
-#Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz
-#Source11: bacula-web.apache
Patch0: bacula-director-configuration.patch
Patch1: bacula-config.patch
-#Patch2: bacula-wxconsole.patch
Patch3: bacula-pamd.patch
-#Patch4: 2.0.3-ampm.patch
-#Patch5: 2.0.3-maxbyteslist.patch
-#Patch6: 2.0.3-maxwaittime.patch
-#Patch7: 2.0.3-scheduler-next-hour.patch
-#Patch8: 2.0.3-verify.patch
-#Patch9: 2.0.3-tls-disconnect.patch
-#Patch10: 2.0.3-restore.patch
-#Patch10: bacula-web-smarty.patch
URL: http://www.bacula.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -293,21 +281,6 @@ This package contains the Gnome- and KDE-compatible tray monitor to
monitor your bacula server.
-#%package web
-#Summary: Bacula Web Interface for monitoring the Backup status
-#Group: System Environment/Daemons
-#Conflicts: bacula-storage-sqlite
-#Requires: php, webserver, php-pear-DB, php-gd, php-Smarty
-
-#%description web
-#Bacula is a set of programs that allow you to manage the backup,
-#recovery, and verification of computer data across a network of
-#different computers. It is based on a client/server architecture.
-
-#This package contains the bacula-web PHP application, which is
-#a management level tool for reporting Backup job status.
-
-
%package docs
Summary: Bacula documentation
Group: Documentation
@@ -323,22 +296,12 @@ This package contains the documentation for most of the bacula-packages.
%prep
%setup -q -c -n bacula-%{version}
%setup -q -a 1 -D -T
-#%setup -q -a 2 -D -T
-#%setup -q -a 10 -D -T
# Patching and other source preparation
pushd bacula-%{version}
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
%patch3 -p1
-#%patch4 -p0
-#%patch5 -p0
-#%patch6 -p0
-#%patch7 -p0
-#%patch8 -p0
-#%patch9 -p0
-#%patch10 -p1
# Remove execution permissions from files we're packaging as docs later on
find examples -type f | xargs chmod -x
@@ -352,11 +315,6 @@ find -name '.cvsignore' | xargs rm -f
find -type f -name '*.c' | xargs chmod -x
find -type f -name '*.h' | xargs chmod -x
-# GUI Stuff is postponed for later
-#pushd bacula-gui-%{gui_version}
-#%patch10 -p0
-#popd
-
# We are building the source several times, each with a different storage backend
mkdir bacula-mysql bacula-postgresql bacula-sqlite
@@ -396,8 +354,6 @@ cp -rl ../bacula-%{version}/* .
--enable-smartalloc \
--with-x \
$*
-# Scratch this, it is trouble
-# --with-readline \
if test $? != 0; then
tail -500 config.log
@@ -497,30 +453,6 @@ pushd bacula-postgresql
done
popd
-pushd bacula-docs-%{docs_version}
- # No install target anymore, we'll include the stuff directly in the %%files section
- # make install DESTDIR=%{buildroot}
-popd
-
-# GUI is not being packaged yet
-#pushd bacula-gui-%{gui_version}/bacula-web
-# mkdir -p %{buildroot}%{_datadir}/bacula-web
-# cp -r -p * %{buildroot}%{_datadir}/bacula-web
-# for f in ChangeLog CONTACT COPYING README TODO; do
-# rm -f %{buildroot}%{_datadir}/bacula-web/$f
-# done
-# rm -f %{buildroot}%{_datadir}/bacula-web/tsmarty2c.php
-# rm -rf %{buildroot}%{_datadir}/bacula-web/external_packages/smarty
-# mv %{buildroot}%{_datadir}/bacula-web/configs/bacula.conf %{buildroot}%{_sysconfdir}/bacula/bacula-web.conf
-# ln -sf /etc/bacula/bacula-web.conf %{buildroot}%{_datadir}/bacula-web/configs/bacula.conf
-# install -D -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/httpd/conf.d/bacula-web.conf
-# mkdir -p %{buildroot}%{_localstatedir}/cache/bacula
-#popd
-
-
-# Rename some manpages
-# Not needed right-now
-#mv %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/tray-monitor.1
rm %{buildroot}%{_mandir}/man1/bat.1.gz
# Fix some wrapper braindeadness
@@ -1113,17 +1045,10 @@ fi
%doc bacula-docs-%{docs_version}/manual/bacula/
-#%files web
-#%defattr(-,root,root,-)
-#%doc bacula-gui-%{gui_version}/bacula-web/CONTACT bacula-gui-%{gui_version}/bacula-web/COPYING
-#%doc bacula-gui-%{gui_version}/bacula-web/README bacula-gui-%{gui_version}/bacula-web/TODO
-#%{_datadir}/bacula-web/
-#%config(noreplace) %{_sysconfdir}/bacula/bacula-web.conf
-#%config(noreplace) %{_sysconfdir}/httpd/conf.d/bacula-web.conf
-#%dir %attr(755, apache, apache) %{_localstatedir}/cache/bacula-web
-
-
%changelog
+* Wed Jul 18 2012 Simone Caronni <negativo17 at gmail.com> 2.4.4-3
+- Removed commented stuff that will never come back.
+
* Sun Feb 28 2010 Felix Schwarz <felix.schwarz at oss.schwarz.eu> 2.4.4-2
- Implement workaround for broken alternatives in 2.0.3-10
More information about the scm-commits
mailing list