Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #14075: Error when building rudder-server-relay #1763

Merged
merged 1 commit into from
Jan 3, 2019
Merged

Fixes #14075: Error when building rudder-server-relay #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions rudder-agent/SPECS/rudder-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,6 @@ This package contains the agent that must be installed on all nodes to be
managed by Rudder. It is based on two main components: CFEngine Community 3 and
FusionInventory.

#=================================================
# Source preparation
#=================================================
%prep

#=================================================
# Building
#=================================================
Expand Down
12 changes: 4 additions & 8 deletions rudder-server-relay/SPECS/rudder-server-relay.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ This package is essentially a meta-package to install all components required to
run a Rudder relay server on a machine.

#=================================================
# Source preparation
# Building
#=================================================
%prep
%build

cd %{_sourcedir}

%if 0%{?suse_version}
# On SLES, change the Apache DocumentRoot to the OS default
Expand All @@ -106,12 +108,6 @@ sed -i "s%^DocumentRoot /var/www$%DocumentRoot /srv/www%" rudder-apache-relay-co
cp -f rudder-relay.fc %{_builddir}
cp -f rudder-relay.te %{_builddir}

#=================================================
# Building
#=================================================
%build

cd %{_sourcedir}
make build

%if 0%{?rhel}
Expand Down
5 changes: 0 additions & 5 deletions rudder-server-root/SPECS/rudder-server-root.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ Rudder is an open source configuration management and audit solution.
This package is essentially a meta-package to install all components required to
run a Rudder root server on a machine.

#=================================================
# Source preparation
#=================================================
%prep

#=================================================
# Building
#=================================================
Expand Down
5 changes: 0 additions & 5 deletions rudder-webapp/SPECS/rudder-webapp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,6 @@ This package contains the web application that is the main user interface to
Rudder. The webapp is automatically installed and started using the Jetty
application server bundled in the rudder-jetty package.

#=================================================
# Source preparation
#=================================================
%prep

#=================================================
# Building
#=================================================
Expand Down