From 78e9afd3cdddbc7f362d38ee80c80af1205677d4 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: May 14 2018 08:28:20 +0000
Subject: Remove libbaccats soname override, disable annobin


---

diff --git a/bacula-7.0.4-autoconf.patch b/bacula-7.0.4-autoconf.patch
deleted file mode 100644
index 0cfe4c8..0000000
--- a/bacula-7.0.4-autoconf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur bacula-7.0.4.old/autoconf/ltmain.sh bacula-7.0.4/autoconf/ltmain.sh
---- bacula-7.0.4.old/autoconf/ltmain.sh	2014-07-24 17:43:23.085243360 +0200
-+++ bacula-7.0.4/autoconf/ltmain.sh	2014-07-24 17:45:12.505330842 +0200
-@@ -2429,6 +2429,7 @@
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-+  -soname SONAME    override the standard shared object name
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-@@ -5434,6 +5435,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+	soname)
-+	  soname_spec="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
-@@ -5754,6 +5760,11 @@
- 	continue
- 	;;
- 
-+      -soname)
-+   prev=soname
-+   continue
-+   ;;
-+
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
diff --git a/bacula.spec b/bacula.spec
index c8afbc2..d50c1ad 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -1,6 +1,9 @@
 %global uid 133
 %global username bacula
 
+# Disable annobin
+%undefine _annotated_build
+
 Name:               bacula
 Version:            9.0.7
 Release:            1%{?dist}
@@ -40,13 +43,6 @@ Patch8:             %{name}-9.0.2-desktop.patch
 # http://bugs.bacula.org/view.php?id=2354
 Patch9:             %{name}-9.0.6-tray-monitor-task.patch
 
-# Original patch removed by mistake, upstream is not willing to add it again:
-# http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a
-# Without this, there is no library providing the correct shared object name
-# required by the daemons.
-# http://bugs.bacula.org/view.php?id=2084
-Patch10:            %{name}-7.0.4-autoconf.patch
-
 BuildRequires:      desktop-file-utils
 BuildRequires:      perl-generators
 BuildRequires:      sed
@@ -323,7 +319,6 @@ Provides check_bacula support for Nagios.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -586,9 +581,6 @@ fi
 %{_libdir}/libbaccfg-%{version}.so
 %{_libdir}/libbacfind-%{version}.so
 %{_libdir}/libbacsd-%{version}.so
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
-%{_libdir}/libbaccats-%{version}.so
-%endif
 
 %files libs-sql
 %{_libdir}/libbaccats-mysql-%{version}.so
@@ -743,6 +735,10 @@ fi
 %changelog
 * Mon May 14 2018 Simone Caronni <negativo17@gmail.com> - 9.0.7-1
 - Update to 9.0.7.
+- Do not override libbaccats soname anymore. As of Fedora 28, the RPM assembly
+  process re-adds the symlink for the missing soname at build time, even if it
+  is explicitly deleted in the install section.
+- Temporarily disable annotated build.
 
 * Wed Feb 07 2018 Josef Ridky <jridky@redhat.com> - 9.0.6-8
 - Return support of Qt4 for older releases