Removed _install, _mkdir and _make macro

This commit is contained in:
Simone Caronni 2012-05-21 15:42:08 +02:00
parent 964c4995e7
commit 33a6de8645

View File

@ -3,7 +3,7 @@
Name: bacula
Version: 5.2.6
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@ -346,16 +346,16 @@ build --disable-bat
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{__make} %{?_smp_mflags}
make %{?_smp_mflags}
pushd examples/nagios/check_bacula
CFLAGS="%{optflags}" %{__make} LIBS="-lpthread -ldl -lssl -lcrypto -lz"
CFLAGS="%{optflags}" make LIBS="-lpthread -ldl -lssl -lcrypto -lz"
popd
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
pushd src/qt-console/tray-monitor
/usr/bin/qmake-qt4
%{__make} %{?_smp_mflags}
make %{?_smp_mflags}
popd
%endif
@ -363,28 +363,27 @@ cp %{SOURCE5} .
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Nagios plugin
%{__install} -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
# Remove catalogue backend symlinks
rm -f %{buildroot}%{_libdir}/libbaccats.so
rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
# Sample query file
%{__install} -m 640 -D examples/sample-query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
install -p -m 640 -D examples/sample-query.sql %{buildroot}%{_sysconfdir}/bacula/query.sql
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
# Bat
%{__install} -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png
install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat.png
desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
# QT Tray monitor
%{__install} -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
%{__install} -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
%{__install} -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
install -p -m 755 -D src/qt-console/tray-monitor/.libs/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
%else
@ -392,36 +391,36 @@ rm -f %{buildroot}%{_mandir}/man1/bat.1*
%endif
# Logrotate
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/bacula
%{__install} -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/bacula
mkdir -p %{buildroot}%{_localstatedir}/log/bacula
install -p -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/bacula
# Logwatch
%{__install} -m 755 -D scripts/logwatch/bacula %{buildroot}%{_sysconfdir}/logwatch/scripts/services/bacula
%{__install} -m 755 -D scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
%{__install} -m 644 -D scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
%{__install} -m 644 -D scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
install -p -m 755 -D scripts/logwatch/bacula %{buildroot}%{_sysconfdir}/logwatch/scripts/services/bacula
install -p -m 755 -D scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
install -p -m 644 -D scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
install -p -m 644 -D scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
%{__install} -m 755 -D %{SOURCE18} %{buildroot}%{_sbindir}/bacula-checkconf
install -p -m 755 -D %{SOURCE18} %{buildroot}%{_sbindir}/bacula-checkconf
%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
# Systemd unit files
%{__mkdir_p} %{buildroot}%{_unitdir}
%{__install} -m 755 -D %{SOURCE10} %{buildroot}%{_unitdir}/bacula-fd.service
%{__install} -m 755 -D %{SOURCE11} %{buildroot}%{_unitdir}/bacula-dir.service
%{__install} -m 755 -D %{SOURCE12} %{buildroot}%{_unitdir}/bacula-sd.service
mkdir -p %{buildroot}%{_unitdir}
install -p -m 755 -D %{SOURCE10} %{buildroot}%{_unitdir}/bacula-fd.service
install -p -m 755 -D %{SOURCE11} %{buildroot}%{_unitdir}/bacula-dir.service
install -p -m 755 -D %{SOURCE12} %{buildroot}%{_unitdir}/bacula-sd.service
%else
# Initscripts
%{__install} -m 755 -D %{SOURCE7} %{buildroot}%{_initrddir}/bacula-fd
%{__install} -m 755 -D %{SOURCE8} %{buildroot}%{_initrddir}/bacula-dir
%{__install} -m 755 -D %{SOURCE9} %{buildroot}%{_initrddir}/bacula-sd
install -p -m 755 -D %{SOURCE7} %{buildroot}%{_initrddir}/bacula-fd
install -p -m 755 -D %{SOURCE8} %{buildroot}%{_initrddir}/bacula-dir
install -p -m 755 -D %{SOURCE9} %{buildroot}%{_initrddir}/bacula-sd
%endif
# Sysconfig
%{__install} -m 644 -D %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/bacula-fd
%{__install} -m 644 -D %{SOURCE16} %{buildroot}%{_sysconfdir}/sysconfig/bacula-dir
%{__install} -m 644 -D %{SOURCE17} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
install -p -m 644 -D %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/bacula-fd
install -p -m 644 -D %{SOURCE16} %{buildroot}%{_sysconfdir}/sysconfig/bacula-dir
install -p -m 644 -D %{SOURCE17} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
# Spool directory
%{__mkdir_p} %{buildroot}%{_localstatedir}/spool/bacula
mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
# Remove stuff we do not need
rm -f %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql,bconsole}
@ -438,10 +437,10 @@ chmod 755 %{buildroot}%{_libexecdir}/bacula/*
chmod 644 %{buildroot}%{_libexecdir}/bacula/btraceback.*
# Install headers
%{__mkdir_p} %{buildroot}%{_includedir}/bacula
mkdir -p %{buildroot}%{_includedir}/bacula
for dir in src src/cats src/console src/dird src/filed src/findlib src/lib src/plugins/fd src/stored; do
%{__mkdir_p} %{buildroot}%{_includedir}/bacula/$dir
%{__install} -m 644 $dir/*.h %{buildroot}%{_includedir}/bacula/$dir
mkdir -p %{buildroot}%{_includedir}/bacula/$dir
install -p -m 644 $dir/*.h %{buildroot}%{_includedir}/bacula/$dir
done
@ -824,6 +823,9 @@ fi
%changelog
* Mon May 21 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-3
- Removed _install, _mkdir and _make macro.
* Fri Mar 16 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-2
- Move libbaccats and libbacsql into bacula-libs-sql package so only
Director and Storage daemons pull in SQL dependencies: