Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	bareos.spec
@@ -1,46 +1,11 @@ -# -# spec file for package bareos -# Copyright (c) 2011-2012 Bruno Friedmann (Ioda-Net) and Philipp Storz (dass IT) -# 2013 Bareos GmbH & Co KG -# -# Redesign of the bareos specfile: goals (20110922) -# -# * only support platforms that are available in OBS -# * activate all options available (if reasonable) -# * single-dir-install is not supported -# * use special group (bconsole) for users that can access bconsole -# * Single packages for: -# * console package -# * dir package ( bsmtp ) -# * sd package ( bls + btape + bcopy + bextract ) -# * fd package ( ) -# * tray monitor -# * bareos-database-{sqlite,postgresql,mysql} (libs) (make_database/tables/grant rights) -# * sql common abstract sql libraries (without db) -# * libs common libraries (without db) -# * tools without link to db libs (bwild, bregex) -# * tools with link to db libs (dbcheck, bscan) -# * bat -# * doc -# -# For openSUSE/SUSE we placed the /usr/sbin/rcscript -# And added the firewall basics rules -# -# Notice : the libbareoscats* package to be able to pass the shlib name policy are -# explicitly named -# -# Please submit bugfixes or comments via http://bugs.opensuse.org/ - Summary: The Network Backup Solution Name: bareos Version: 13.2.2 -Release: 7.1%{?dist} +Release: 1 Group: Productivity/Archiving/Backup License: AGPL-3.0 BuildRoot: %{_tmppath}/%{name}-root URL: http://www.bareos.org/ -Vendor: The Bareos Team -#Packager: {_packager} %define _libversion 13.2.2 @@ -66,18 +31,11 @@ %define build_bat 1 %define build_qt_monitor 1 %define build_sqlite3 1 -%define systemd 0 -# firewall installation -%define install_suse_fw 0 - -%if 0%{?suse_version} > 1010 -%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -%define install_suse_fw 1 -%endif - -%if 0%{?suse_version} > 1140 \|\| 0%{?fedora_version} > 14 -%define systemd_support 1 +%if 0%{?rhel_version} == 700 +%define systemd 1 +%else +%define systemd 0 %endif # centos/rhel 5 : segfault when building qt monitor @@ -86,12 +44,6 @@ %define build_qt_monitor 0 %endif -%if 0%{?sles_version} == 10 -%define build_bat 0 -%define build_qt_monitor 0 -%define build_sqlite3 0 -%endif - %if 0%{?systemd_support} BuildRequires: systemd %{?systemd_requires} @@ -127,29 +79,11 @@ BuildRequires: openssl BuildRequires: libcap-devel BuildRequires: mtx +BuildRequires: tcp_wrappers-devel -%if 0%{?suse_version} -# link identical files -BuildRequires: fdupes -BuildRequires: termcap -BuildRequires: pwdutils -BuildRequires: tcpd-devel -BuildRequires: update-desktop-files - -# Some magic to be able to determine what platform we are running on. -%if !0%{sles_version} -BuildRequires: openSUSE-release -%else -%if 0%{?sles_version} && !0%{?sled_version} -BuildRequires: sles-release -%else -BuildRequires: sled-release -%endif -%endif BuildRequires: lsb-release -%else BuildRequires: qt4-devel BuildRequires: libtermcap-devel BuildRequires: passwd @@ -167,11 +101,6 @@ # Older RHEL (5)/ CentOS (5) BuildRequires: redhat-release %endif -%else -# Non redhat like distribution for example mandriva. -BuildRequires: lsb-release -%endif -%endif %if 0%{?rhel_version} >= 600 \|\| 0%{?centos_version} >= 600 \|\| 0%{?fedora_version} >= 14 BuildRequires: tcp_wrappers-devel @@ -209,9 +138,6 @@ Group: Productivity/Archiving/Backup Requires: %{name}-bconsole = %{version} Requires: %{name}-filedaemon = %{version} -%if 0%{?suse_version} -Recommends: %{name}-traymonitor = %{version} -%endif %package director Summary: Provide bareos director daemon @@ -219,11 +145,6 @@ Requires: %{name}-common = %{version} Requires: %{name}-database-common = %{version} Requires: %{name}-database-tools -%if 0%{?suse_version} -# Don't use this option on anything other then SUSE derived distributions -# as Fedora & others don't know this tag -Recommends: logrotate -%endif Provides: %{name}-dir %package storage @@ -236,9 +157,6 @@ Summary: Provide bareos storage daemon tape support Group: Productivity/Archiving/Backup Requires: mtx -%if !0%{?suse_version} -Requires: mt-st -%endif %package filedaemon Summary: Provide bareos file daemon service @@ -277,13 +195,9 @@ %package database-sqlite3 Summary: Libs & tools for sqlite3 catalog Group: Productivity/Archiving/Backup -%if 0%{?suse_version} -Requires: sqlite3 -%endif Requires: %{name}-database-common = %{version} Provides: %{name}-catalog-sqlite3 Provides: %{name}-database-backend -%endif %package database-tools Summary: Provides bareos-dbcheck, bscan @@ -321,13 +235,7 @@ Requires: libacl-devel Requires: libmysqlclient-devel Requires: postgresql-devel -%if 0%{?build_sqlite3} -%if 0%{?suse_version} -Requires: sqlite3-devel -%else Requires: sqlite-devel -%endif -%endif Requires: libopenssl-devel Requires: libcap-devel @@ -428,9 +336,6 @@ %setup %build -%if %{undefined suse_version} -export PATH=$PATH:/usr/lib64/qt4/bin:/usr/lib/qt4/bin -%endif export MTX=/usr/sbin/mtx # Notice keep the upstream order of ./configure --help %configure \ @@ -497,14 +402,8 @@