Correctly fixed RPM package builds on Fedora. (#8595)

* Revert "Fix broken Fedora 30/31 RPM builds (#8572)"

This reverts commit 71290d9cb904e8ea08456e5c4ab24bc274e593bf.

It didn't actually fix things and caused a different set of issues.

* Build LWS and mosquitto with -fPIC in RPM builds.

This fixeslinking errors that are currently causing RPM package build
failures for Fedora 30/31.

.travis.yml

@@ -329,7 +329,6 @@ jobs:
       <<: *RPM_TEMPLATE
       if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
       env:
-        - CFLAGS="-fPIC"
         - BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="31" BUILD_STRING="fedora/31"
         - PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
         - ALLOW_SOFT_FAILURE_HERE=true
@@ -338,7 +337,6 @@ jobs:
       <<: *RPM_TEMPLATE
       if: commit_message =~ /\[Package (amd64|arm64) RPM( Fedora)?\]/
       env:
-        - CFLAGS="-fPIC"
         - BUILDER_NAME="builder" BUILD_DISTRO="fedora" BUILD_RELEASE="30" BUILD_STRING="fedora/30"
         - PACKAGE_TYPE="rpm" REPO_TOOL="dnf"
         - ALLOW_SOFT_FAILURE_HERE=true

.travis/package_management/trigger_rpm_lxc_build.py

@@ -50,6 +50,6 @@ common.run_command(container, [os.environ["REPO_TOOL"], "install", "-y", "rpmdev
 
 # Run the build process on the container
 print("Starting RPM build process")
-common.run_command(container, ["sudo", "-E", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
+common.run_command(container, ["sudo", "-u", os.environ['BUILDER_NAME'], "rpmbuild", "-ba", "--rebuild", "/home/%s/rpmbuild/SPECS/netdata.spec" % os.environ['BUILDER_NAME']])
 
 print('Done!')

netdata.spec.in

@@ -233,8 +233,8 @@ happened, on your systems and applications.
 
 %prep
 %setup -q -n %{name}-%{version}
-${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
-${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
+export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
 
 %build
 # Conf step