Fix bat help button, remove some spec bits from previous versions
This commit is contained in:
parent
0e75ff5f1c
commit
51ec14dd2c
24
bacula.spec
24
bacula.spec
@ -1,6 +1,6 @@
|
||||
Name: bacula
|
||||
Version: 5.2.2
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
||||
# See LICENSE for details
|
||||
License: GPLv2 with exceptions
|
||||
@ -306,13 +306,6 @@ Provides check_bacula support for Nagios.
|
||||
# Remove execution permissions from files we're packaging as docs later on
|
||||
find updatedb -type f | xargs chmod -x
|
||||
|
||||
# Remove cvs left-overs
|
||||
find -name '.cvsignore' | xargs rm -f
|
||||
|
||||
# Fix perms of c files to silent rpmlint
|
||||
find -type f -name '*.c' | xargs chmod -x
|
||||
find -type f -name '*.h' | xargs chmod -x
|
||||
|
||||
%build
|
||||
build() {
|
||||
export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
|
||||
@ -359,7 +352,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
|
||||
|
||||
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
|
||||
export QMAKE=/usr/bin/qmake-qt4
|
||||
build --enable-bat
|
||||
build --enable-bat --htmldir=%{_datadir}/doc/bacula-console-bat-%{version}
|
||||
%else
|
||||
build --disable-bat
|
||||
%endif
|
||||
@ -392,6 +385,7 @@ pushd bacula-docs-%{version}
|
||||
make
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
@ -402,7 +396,6 @@ make install DESTDIR=%{buildroot}
|
||||
%{__install} -m0755 examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/
|
||||
|
||||
# Remove unused stuff
|
||||
rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
|
||||
rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1*
|
||||
rm -f %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1*
|
||||
|
||||
@ -417,8 +410,6 @@ mkdir -p %{buildroot}%{_bindir}
|
||||
|
||||
# Bat
|
||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||
install -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}
|
||||
install -m 644 -D src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bacula/bat.conf
|
||||
install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
|
||||
install -m 644 -D scripts/bat.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
|
||||
install -m 644 -D scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
|
||||
@ -461,7 +452,7 @@ install -m 644 -D %{SOURCE17} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
|
||||
mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
|
||||
|
||||
# Nuke the startup scripts we do not need
|
||||
rm -f %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql}
|
||||
rm -f %{buildroot}%{_libexecdir}/bacula/{bacula,bacula-ctl-*,startmysql,stopmysql,bconsole}
|
||||
rm -f %{buildroot}%{_sbindir}/bacula
|
||||
rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
|
||||
|
||||
@ -679,7 +670,7 @@ fi
|
||||
|
||||
%files common
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING LICENSE README SUPPORT VERIFYING
|
||||
%doc AUTHORS ChangeLog COPYING LICENSE README SUPPORT VERIFYING ReleaseNotes
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{_libexecdir}/%{name}
|
||||
@ -813,6 +804,7 @@ fi
|
||||
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
|
||||
%files console-bat
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_datadir}/doc/bacula-console-bat-%{version}/*
|
||||
%config(noreplace) %{_sysconfdir}/security/console.apps/bat
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/bat
|
||||
%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
|
||||
@ -844,6 +836,10 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Dec 11 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-11
|
||||
- Add bat html docs so the help button works.
|
||||
- Minor packaging changes.
|
||||
|
||||
* Sat Dec 10 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-10
|
||||
- Added patch for mysql 5.5.18 from Oliver Falk.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user