X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fplatforms%2Fsuse%2Fbacula.spec.in;h=f6a1730653edf5f31f3e94ff505540070866de73;hb=861a205cf16b273c446fb079a7aee2feacc7dfe0;hp=c65223bc0907f37be0e01a7552fe7b342ad6a066;hpb=48cf01c5720b0751a587c248dd3aa43f68cebb8c;p=bacula%2Fbacula diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in index c65223bc09..f6a1730653 100644 --- a/bacula/platforms/suse/bacula.spec.in +++ b/bacula/platforms/suse/bacula.spec.in @@ -1,5 +1,5 @@ # Bacula RPM spec file -# Copyright (C) 2000-2005 Kern Sibbald +# Copyright (C) 2000-2006 Kern Sibbald # Platform Build Configuration @@ -13,12 +13,12 @@ %define file_daemon_user root %define daemon_group bacula # group that has write access to tape devices, usually disk on Linux -%define device_group disk +%define storage_daemon_group disk %define user_file /etc/passwd %define group_file /etc/group %define useradd /usr/sbin/useradd %define groupadd /usr/sbin/groupadd -%define _rescuever 1.8.1 +%define _rescuever 1.8.2 # platform defines - set one below or define the build_xxx on the command line # RedHat builds @@ -34,7 +34,7 @@ %define fc3 0 %{?build_fc3:%define fc3 1} %define fc4 0 -%{?build_fc4:%define fc3 1} +%{?build_fc4:%define fc4 1} # Whitebox Enterprise build %define wb3 0 %{?build_wb3:%define wb3 1} @@ -46,18 +46,23 @@ %{?build_rhel4:%define rhel4 1} %{?build_rhel4:%define fc3 1} # CentOS build +%define centos3 0 +%{?build_centos3:%define centos3 1} +%{?build_centos3:%define wb3 1} %define centos4 0 %{?build_centos4:%define centos4 1} %{?build_centos4:%define fc3 1} # SuSE build %define su9 0 %{?build_su9:%define su9 1} +%define su10 0 +%{?build_su10:%define su10 1} # Mandrake build %define mdk 0 %{?build_mdk:%define mdk 1} # test for a platform definition -%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{wb3} && ! %{su9} && ! %{mdk} +%if ! %{rh7} && ! %{rh8} && ! %{rh9} && ! %{fc1} && ! %{fc3} && ! %{fc4} && ! %{wb3} && ! %{su9} && ! %{su10} && ! %{mdk} %{error: You must specify a platform. Please examine the spec file.} exit 1 %endif @@ -100,20 +105,20 @@ exit 1 %if %{rh7} || %{rh8} || %{rh9} || %{rhel3} || %{rhel4} %define _dist %(grep Red /etc/redhat-release) %endif -%if %{fc1} +%if %{fc1} || %{fc4} %define _dist %(grep Fedora /etc/redhat-release) %endif -%if %{centos4} +%if %{centos4} || %{centos3} %define _dist %(grep CentOS /etc/redhat-release) %endif %if %{fc3} && ! %{rhel4} && ! %{centos4} %define _dist %(grep Fedora /etc/redhat-release) %endif -%if %{wb3} && ! %{rhel3} +%if %{wb3} && ! %{rhel3} && ! %{centos3} %define _dist %(grep White /etc/whitebox-release) %endif -%if %{su9} -%define _dist %(grep SuSE /etc/SuSE-release) +%if %{su9} || %{su10} +%define _dist %(grep -i SuSE /etc/SuSE-release) %endif %if %{mdk} %define _dist %(grep Mandrake /etc/mandrake-release) @@ -169,6 +174,24 @@ BuildRequires: gconf2-devel BuildRequires: linc-devel BuildRequires: freetype2-devel %endif +%if %{su10} +BuildRequires: termcap +BuildRequires: libgnome >= 2.12 +BuildRequires: gtk2-devel >= 2.8 +BuildRequires: libgnomeui-devel >= 2.12 +BuildRequires: glibc-devel >= 2.3 +BuildRequires: ORBit2-devel +BuildRequires: libart_lgpl-devel >= 2.3 +BuildRequires: libbonobo-devel >= 2.10 +BuildRequires: libbonoboui-devel >= 2.10 +BuildRequires: bonobo-activation-devel +BuildRequires: gconf2-devel +BuildRequires: freetype2-devel +BuildRequires: cairo-devel +BuildRequires: fontconfig-devel >= 2.3 +BuildRequires: gnome-vfs2-devel >= 2.12 +BuildRequires: libpng-devel +%endif %if %{mdk} BuildRequires: libtermcap-devel BuildRequires: gtk2-devel >= 2.0 @@ -197,7 +220,20 @@ BuildRequires: bonobo-activation-devel BuildRequires: GConf2-devel BuildRequires: freetype-devel %endif -%if ! %{rh7} && ! %{su9} && ! %{mdk} && ! %{fc3} +%if %{fc4} +BuildRequires: libtermcap-devel +BuildRequires: gtk2-devel >= 2.6 +BuildRequires: libgnomeui-devel >= 2.10 +BuildRequires: glibc-devel >= 2.3 +BuildRequires: ORBit2-devel +BuildRequires: libart_lgpl-devel >= 2.3 +BuildRequires: libbonobo-devel >= 2.8 +BuildRequires: libbonoboui-devel >= 2.8 +BuildRequires: bonobo-activation-devel +BuildRequires: GConf2-devel +BuildRequires: freetype-devel +%endif +%if ! %{rh7} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} BuildRequires: libtermcap-devel BuildRequires: gtk2-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 @@ -260,11 +296,11 @@ Requires: ncurses, libstdc++, zlib, openssl, mtx Requires: glibc >= 2.2 Requires: libtermcap %endif -%if %{su9} +%if %{su9} || %{su10} Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} +%if ! %{rh7} && ! %{su9} && ! %{su10} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -273,7 +309,7 @@ Requires: libtermcap Requires: mysql >= 3.23 Requires: mysql-server >= 3.23 %endif -%if %{mysql} && ! %{su9} && ! %{mdk} && %{mysql4} +%if %{mysql} && ! %{su9} && ! %{su10} && ! %{mdk} && %{mysql4} Requires: mysql >= 4.0 Requires: mysql-server >= 4.0 %endif @@ -286,6 +322,10 @@ Requires: mysql-client >= 3.23 Requires: mysql >= 4.0 Requires: mysql-client >= 4.0 %endif +%if %{mysql} && %{su10} && %{mysql4} +Requires: mysql >= 4.0 +Requires: mysql-client >= 4.0 +%endif %if %{mysql} && %{mdk} && ! %{mysql4} Requires: mysql >= 3.23 @@ -358,11 +398,11 @@ Requires: libstdc++, zlib, openssl Requires: glibc >= 2.2 Requires: libtermcap %endif -%if %{su9} +%if %{su9} || %{su10} Requires: glibc >= 2.3 Requires: termcap %endif -%if ! %{rh7} && ! %{su9} +%if ! %{rh7} && ! %{su9} && ! %{su10} Requires: glibc >= 2.3 Requires: libtermcap %endif @@ -404,8 +444,7 @@ database. %package gconsole Summary: Bacula - The Network Backup Solution Group: System Environment/Daemons -Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd -Requires: usermode, openssl +Requires: atk, libstdc++, zlib, pango, libxml2, bacula-fd, openssl %endif %if %{gconsole} && %{su9} @@ -422,6 +461,23 @@ Requires: gconf2 Requires: linc Requires: freetype2 %endif +%if %{gconsole} && %{su10} +Requires: gtk2 >= 2.8 +Requires: libgnome >= 2.12 +Requires: libgnomeui >= 2.12 +Requires: glibc >= 2.3 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.10 +Requires: libbonoboui >= 2.10 +Requires: bonobo-activation +Requires: gconf2 +Requires: freetype2 +Requires: cairo +Requires: fontconfig >= 2.3 +Requires: gnome-vfs2 >= 2.12 +Requires: libpng +%endif %if %{gconsole} && %{mdk} Requires: gtk2 >= 2.0 Requires: libgnomeui2 @@ -445,7 +501,19 @@ Requires: bonobo-activation Requires: GConf2 Requires: freetype %endif -%if %{gconsole} && ! %{su9} && ! %{mdk} && ! %{fc3} +%if %{gconsole} && %{fc4} +Requires: gtk2 >= 2.6 +Requires: libgnomeui >= 2.10 +Requires: glibc >= 2.3 +Requires: ORBit2 +Requires: libart_lgpl >= 2.3 +Requires: libbonobo >= 2.8 +Requires: libbonoboui >= 2.8 +Requires: bonobo-activation +Requires: GConf2 +Requires: freetype +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} && ! %{mdk} && ! %{fc3} && ! %{fc4} Requires: gtk2 >= 2.0 Requires: libgnomeui >= 2.0 Requires: glibc >= 2.3 @@ -461,6 +529,12 @@ Requires: freetype %if %{gconsole} && %{su9} Requires: xsu %endif +%if %{gconsole} && %{su10} +Requires: xsu +%endif +%if %{gconsole} && ! %{su9} && ! %{su10} +Requires: usermode +%endif %if %{gconsole} %description gconsole @@ -488,7 +562,7 @@ server packages. %build -%if %{su9} +%if %{su9} || %{su10} export LDFLAGS="-L/usr/lib/termcap" %endif @@ -519,6 +593,9 @@ patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch %if %{sqlite} && %{su9} patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch %endif +%if %{sqlite} && %{su10} +patch platforms/suse/bacula-dir.in platforms/suse/bacula-dir-suse-sqlite.patch +%endif # 64 bit lib location hacks # this is the location on redhat type platforms, don't know about others yet @@ -529,6 +606,20 @@ export LDFLAGS=-L/usr/lib64 export LDFLAGS=-L/usr/lib64/mysql %endif +%configure \ + --prefix=/usr \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc/bacula \ + --with-scriptdir=/etc/bacula \ + --enable-smartalloc \ + --enable-client-only \ + %if %{mdk} + --disable-nls \ + %endif + --enable-static-fd + +make + %configure \ --prefix=/usr \ --sbindir=/usr/sbin \ @@ -556,7 +647,7 @@ export LDFLAGS=-L/usr/lib64/mysql --with-dir-user=%{director_daemon_user} \ --with-dir-group=%{daemon_group} \ --with-sd-user=%{storage_daemon_user} \ - --with-sd-group=%{daemon_group} \ + --with-sd-group=%{storage_daemon_group} \ --with-fd-user=%{file_daemon_user} \ --with-fd-group=%{daemon_group} \ --with-dir-password="XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX" \ @@ -583,7 +674,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps mkdir -p $RPM_BUILD_ROOT/usr/share/applications %endif mkdir -p $RPM_BUILD_ROOT/etc/bacula/updatedb -%if %{gconsole} && ! %{su9} +%if %{gconsole} && ! %{su9} && ! %{su10} mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/security/console.apps mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -624,8 +715,10 @@ rm -f $RPM_BUILD_ROOT/etc/bacula/startmysql rm -f $RPM_BUILD_ROOT/etc/bacula/stopmysql %endif +rm -f $RPM_BUILD_ROOT/usr/sbin/static-bacula-fd + # install the init scripts -%if %{su9} +%if %{su9} || %{su10} cp -p platforms/suse/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/suse/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/suse/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -635,7 +728,7 @@ cp -p platforms/mandrake/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/mandrake/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/mandrake/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd %endif -%if ! %{su9} && ! %{mdk} +%if ! %{su9} && ! %{su10} && ! %{mdk} cp -p platforms/redhat/bacula-dir $RPM_BUILD_ROOT/etc/init.d/bacula-dir cp -p platforms/redhat/bacula-fd $RPM_BUILD_ROOT/etc/init.d/bacula-fd cp -p platforms/redhat/bacula-sd $RPM_BUILD_ROOT/etc/init.d/bacula-sd @@ -649,7 +742,13 @@ cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/b cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{mdk} +%if %{gconsole} && %{su10} +cp -p scripts/bacula.png $RPM_BUILD_ROOT/usr/share/pixmaps/bacula.png +cp -p scripts/bacula.desktop.gnome2.xsu $RPM_BUILD_ROOT/usr/share/applications/bacula.desktop +cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm +cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop +%endif +%if %{rh8} || %{rh9} || %{wb3} || %{fc1} || %{fc3} || %{fc4} || %{mdk} %define iftrick 1 %else %define iftrick 0 @@ -695,6 +794,9 @@ cp -p %{_rescuesrc}/configure $RPM_BUILD_ROOT/etc/bacula/rescue/ cp -p %{_rescuesrc}/version.h $RPM_BUILD_ROOT/etc/bacula/rescue/ cp -pr %{_rescuesrc}/linux $RPM_BUILD_ROOT/etc/bacula/rescue/ cp -pr %{_rescuesrc}/autoconf $RPM_BUILD_ROOT/etc/bacula/rescue/ +touch $RPM_BUILD_ROOT/etc/bacula/rescue/linux/cdrom/rpm_release +cp -p src/filed/static-bacula-fd $RPM_BUILD_ROOT/etc/bacula/rescue/linux/cdrom/bacula/bin/bacula-fd +rm -f src/filed/static-bacula-fd # now clean up permissions that are left broken by the install chmod o-r $RPM_BUILD_ROOT/etc/bacula/query.sql @@ -707,30 +809,29 @@ chmod 644 $RPM_BUILD_ROOT/etc/bacula/tray-monitor.conf %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" - %if %{mysql} # MySQL specific files %files mysql %defattr(-, root, root) -%attr(0750, root, %{daemon_group}) /etc/bacula/create_mysql_database -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_mysql_database -%attr(0750, root, %{daemon_group}) /etc/bacula/make_mysql_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_mysql_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/update_mysql_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/grant_mysql_privileges -%attr(0750, root, %{daemon_group}) /etc/bacula/startmysql -%attr(0750, root, %{daemon_group}) /etc/bacula/stopmysql +%attr(-, root, %{daemon_group}) /etc/bacula/create_mysql_database +%attr(-, root, %{daemon_group}) /etc/bacula/drop_mysql_database +%attr(-, root, %{daemon_group}) /etc/bacula/make_mysql_tables +%attr(-, root, %{daemon_group}) /etc/bacula/drop_mysql_tables +%attr(-, root, %{daemon_group}) /etc/bacula/update_mysql_tables +%attr(-, root, %{daemon_group}) /etc/bacula/grant_mysql_privileges +%attr(-, root, %{daemon_group}) /etc/bacula/startmysql +%attr(-, root, %{daemon_group}) /etc/bacula/stopmysql %endif %if %{sqlite} %files sqlite %defattr(-,root,root) -%attr(0750, root, %{daemon_group}) /etc/bacula/create_sqlite_database -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_sqlite_database -%attr(0750, root, %{daemon_group}) /etc/bacula/grant_sqlite_privileges -%attr(0750, root, %{daemon_group}) /etc/bacula/make_sqlite_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_sqlite_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/update_sqlite_tables +%attr(-, root, %{daemon_group}) /etc/bacula/create_sqlite_database +%attr(-, root, %{daemon_group}) /etc/bacula/drop_sqlite_database +%attr(-, root, %{daemon_group}) /etc/bacula/grant_sqlite_privileges +%attr(-, root, %{daemon_group}) /etc/bacula/make_sqlite_tables +%attr(-, root, %{daemon_group}) /etc/bacula/drop_sqlite_tables +%attr(-, root, %{daemon_group}) /etc/bacula/update_sqlite_tables %{sqlite_bindir}/libsqlite.a %{sqlite_bindir}/sqlite.h %{sqlite_bindir}/sqlite @@ -739,50 +840,48 @@ chmod 644 $RPM_BUILD_ROOT/etc/bacula/tray-monitor.conf %if %{postgresql} %files postgresql %defattr(-,root,root) -%attr(0750, root, %{daemon_group}) /etc/bacula/create_postgresql_database -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_postgresql_database -%attr(0750, root, %{daemon_group}) /etc/bacula/make_postgresql_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_postgresql_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/update_postgresql_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/grant_postgresql_privileges +%attr(-, root, %{daemon_group}) /etc/bacula/create_postgresql_database +%attr(-, root, %{daemon_group}) /etc/bacula/drop_postgresql_database +%attr(-, root, %{daemon_group}) /etc/bacula/make_postgresql_tables +%attr(-, root, %{daemon_group}) /etc/bacula/drop_postgresql_tables +%attr(-, root, %{daemon_group}) /etc/bacula/update_postgresql_tables +%attr(-, root, %{daemon_group}) /etc/bacula/grant_postgresql_privileges %endif # The rest is DB backend independent -%attr(0750, root, %{daemon_group}) %dir /etc/bacula -%attr(0750, root, %{daemon_group}) /etc/bacula/bacula -%attr(0750, root, %{daemon_group}) /etc/bacula/bconsole -%attr(0750, root, %{daemon_group}) /etc/bacula/create_bacula_database -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_bacula_database -%attr(0750, root, %{daemon_group}) /etc/bacula/grant_bacula_privileges -%attr(0750, root, %{daemon_group}) /etc/bacula/make_bacula_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/drop_bacula_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/update_bacula_tables -%attr(0750, root, %{daemon_group}) /etc/bacula/make_catalog_backup -%attr(0750, root, %{daemon_group}) /etc/bacula/delete_catalog_backup -%attr(0750, root, %{daemon_group}) /etc/bacula/mtx-changer -%attr(0640, root, %{daemon_group}) /etc/bacula/btraceback.dbx -%attr(0640, root, %{daemon_group}) /etc/bacula/btraceback.gdb -#%attr(0750, root, %{daemon_group}) /etc/bacula/dvd-freespace -#%attr(0750, root, %{daemon_group}) /etc/bacula/dvd-writepart -%attr(0750, root, %{daemon_group}) /etc/bacula/dvd-handler -%attr(0750, root, %{daemon_group}) /etc/init.d/bacula-dir -%attr(0750, root, %{daemon_group}) /etc/init.d/bacula-fd -%attr(0750, root, %{daemon_group}) /etc/init.d/bacula-sd -%attr(0750, root, %{daemon_group}) /etc/bacula/rescue +%attr(-, root, %{daemon_group}) %dir /etc/bacula +%attr(-, root, %{daemon_group}) /etc/bacula/bacula +%attr(-, root, %{daemon_group}) /etc/bacula/bconsole +%attr(-, root, %{daemon_group}) /etc/bacula/create_bacula_database +%attr(-, root, %{daemon_group}) /etc/bacula/drop_bacula_database +%attr(-, root, %{daemon_group}) /etc/bacula/grant_bacula_privileges +%attr(-, root, %{daemon_group}) /etc/bacula/make_bacula_tables +%attr(-, root, %{daemon_group}) /etc/bacula/drop_bacula_tables +%attr(-, root, %{daemon_group}) /etc/bacula/update_bacula_tables +%attr(-, root, %{daemon_group}) /etc/bacula/make_catalog_backup +%attr(-, root, %{daemon_group}) /etc/bacula/delete_catalog_backup +%attr(-, root, %{daemon_group}) /etc/bacula/btraceback.dbx +%attr(-, root, %{daemon_group}) /etc/bacula/btraceback.gdb +%attr(-, root, %{daemon_group}) /etc/bacula/rescue +%attr(-, root, %{daemon_group}) /etc/init.d/bacula-dir +%attr(-, root, %{daemon_group}) /etc/init.d/bacula-fd +%attr(-, root, %{storage_daemon_group}) /etc/bacula/dvd-handler +%attr(-, root, %{storage_daemon_group}) /etc/init.d/bacula-sd +%attr(-, root, %{storage_daemon_group}) /etc/bacula/mtx-changer %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt /etc/logrotate.d/bacula /etc/log.d/scripts/services/bacula -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-dir.conf -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-fd.conf -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-sd.conf -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf -%attr(0640, root, %{daemon_group}) /etc/bacula/query.sql -%attr(0770, root, %{daemon_group}) %dir %{working_dir} +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-dir.conf +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-fd.conf +%attr(-, root, %{storage_daemon_group}) %config(noreplace) /etc/bacula/bacula-sd.conf +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/logfiles/bacula.conf +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/log.d/conf/services/bacula.conf +%attr(-, root, %{daemon_group}) /etc/bacula/query.sql +%attr(-, root, %{daemon_group}) %dir %{working_dir} /usr/sbin/bacula-dir /usr/sbin/bacula-fd @@ -842,9 +941,15 @@ if [ -z "$HAVE_BACULA" ]; then echo "The group %{daemon_group} has been added to %{group_file}." echo "See the manual chapter \"Running Bacula\" for details." fi +HAVE_BACULA=`grep %{storage_daemon_group} %{group_file} 2>/dev/null` +if [ -z "$HAVE_BACULA" ]; then + %{groupadd} -r %{storage_daemon_group} > /dev/null 2>&1 + echo "The group %{storage_daemon_group} has been added to %{group_file}." + echo "See the manual chapter \"Running Bacula\" for details." +fi HAVE_BACULA=`grep %{storage_daemon_user} %{user_file} 2>/dev/null` if [ -z "$HAVE_BACULA" ]; then - %{useradd} -r -c "Bacula" -d %{working_dir} -g %{daemon_group} -G %{device_group} -M -n -s /sbin/nologin %{storage_daemon_user} > /dev/null 2>&1 + %{useradd} -r -c "Bacula" -d %{working_dir} -g %{storage_daemon_group} -M -n -s /sbin/nologin %{storage_daemon_user} > /dev/null 2>&1 echo "The user %{storage_daemon_user} has been added to %{user_file}." echo "See the manual chapter \"Running Bacula\" for details." fi @@ -989,33 +1094,33 @@ fi %files mtx -/usr/sbin/loaderinfo -/usr/sbin/mtx -/usr/sbin/scsitape -/usr/sbin/tapeinfo +%attr(-, root, %{storage_daemon_group}) /usr/sbin/loaderinfo +%attr(-, root, %{storage_daemon_group}) /usr/sbin/mtx +%attr(-, root, %{storage_daemon_group}) /usr/sbin/scsitape +%attr(-, root, %{storage_daemon_group}) /usr/sbin/tapeinfo /usr/man/man1/* %files client %defattr(-,root,root) -%attr(0750, root, %{daemon_group}) %dir /etc/bacula -%attr(0750, root, %{daemon_group}) /etc/bacula/bconsole +%attr(-, root, %{daemon_group}) %dir /etc/bacula +%attr(-, root, %{daemon_group}) /etc/bacula/bconsole /etc/init.d/bacula-fd -%attr(0750, root, %{daemon_group}) /etc/bacula/rescue +%attr(-, root, %{daemon_group}) /etc/bacula/rescue %doc COPYING ChangeLog ReleaseNotes VERIFYING kernstodo %doc %{_docsrc}/manual/bacula.pdf %{_docsrc}/developers/developers.pdf %{_docsrc}/manual/bacula ../Release_Notes-%{version}-%{release}.txt /etc/logrotate.d/bacula -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-fd.conf -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf -%attr(0770, root, %{daemon_group}) %dir %{working_dir} +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bacula-fd.conf +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/bconsole.conf +%attr(-, root, %{daemon_group}) %dir %{working_dir} /usr/sbin/bacula-fd /usr/sbin/btraceback -%attr(0640, root, %{daemon_group}) /etc/bacula/btraceback.gdb -%attr(0640, root, %{daemon_group}) /etc/bacula/btraceback.dbx +%attr(-, root, %{daemon_group}) /etc/bacula/btraceback.gdb +%attr(-, root, %{daemon_group}) /etc/bacula/btraceback.dbx /usr/sbin/bsmtp /usr/sbin/bconsole @@ -1082,9 +1187,9 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" %files gconsole %defattr(-,root,root) /usr/sbin/gnome-console -%attr(0750, root, %{daemon_group}) %dir /etc/bacula -%attr(075, root, %{daemon_group}) /etc/bacula/gconsole -%attr(0640, root, %{daemon_group}) %config(noreplace) /etc/bacula/gnome-console.conf +%attr(-, root, %{daemon_group}) %dir /etc/bacula +%attr(-, root, %{daemon_group}) /etc/bacula/gconsole +%attr(-, root, %{daemon_group}) %config(noreplace) /etc/bacula/gnome-console.conf /usr/share/pixmaps/bacula.png %endif @@ -1099,7 +1204,7 @@ echo "The database update scripts were installed to /etc/bacula/updatedb" /usr/share/applications/bacula-tray-monitor.desktop %endif -%if %{gconsole} && ! %{su9} +%if %{gconsole} && ! %{su9} && ! %{su10} # add the console helper files %config(noreplace,missingok) /etc/pam.d/gnome-console %config(noreplace,missingok) /etc/security/console.apps/gnome-console @@ -1134,6 +1239,20 @@ fi %endif %changelog +* Sun Jan 29 2006 D. Scott Barninger +- add centos3 build tag +- fix link error of static-fd on Mandrake with --disable-nls +* Fri Jan 27 2006 D. Scott Barninger +- add fc4 dependencies +* Mon Jan 23 2006 D. Scott Barninger +- add SuSE 10.0 build +- remove specific permission in attrib macros +* Sat Jan 21 2006 D. Scott Barninger +- 1.38.5 release +- fix usermode required on suse, suse doesn't have usermode (xsu instead) +- refix compat for _dist on SLES9 which seems to have been removed +- added note regarding Aleksandar's use of specific permissions in attrib macros +- need to review and add specific fc4 build currently using fc3 Requires * Wed Dec 14 2005 Aleksandar Milivojevic - 1.38.2 release - Reorganize files and pre/post sections to remove repetitions