Fixes #25890: Remove rudder-synchronize and rudder-api-client dependency

Normation · Nov 18, 2024 · 48e6926 · 48e6926
1 parent ac7bb76
commit 48e6926
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 375 deletions.
diff --git a/rudder-server/SOURCES/Makefile b/rudder-server/SOURCES/Makefile
@@ -196,7 +196,6 @@ install: build rudder-server-version initial-promises initial-ncf
 	install -m 755 rudder-node-to-relay $(DESTDIR)/opt/rudder/bin/
 	install -m 755 rudder-metrics-reporting $(DESTDIR)/opt/rudder/bin/
 	install -m 755 rudder-reload-cf-serverd $(DESTDIR)/opt/rudder/bin/
-	install -m 755 rudder_synchronize.py ${DESTDIR}/opt/rudder/bin/
 	install -m 755 split-vhost ${DESTDIR}/opt/rudder/bin/
 
 	install -m 644 $(WEB_RESOURCES)/demo-rudder-users.xml $(DESTDIR)/opt/rudder/etc/rudder-users.xml

diff --git a/rudder-server/SOURCES/rudder_synchronize.py b/rudder-server/SOURCES/rudder_synchronize.py
diff --git a/rudder-server/SPECS/rudder-server.spec b/rudder-server/SPECS/rudder-server.spec
@@ -80,7 +80,6 @@ Obsoletes: rudder-reports < 7.2
 
 Requires: %(../format-dependencies rpm %{old_epoch}:%{real_version} rudder-agent)
 Requires: %(../format-dependencies rpm %{real_version} rudder-relay)
-Requires: %(../format-dependencies rpm %{real_version} rudder-api-client)
 Requires: %{apache}, %{apache_tools}, git-core, iproute, rsync, openssl, %{ldap_clients}, curl, acl, zip, tar
 
 # yum doesn't support installing a preferred package in a A or B situation

diff --git a/rudder-server/debian/rules b/rudder-server/debian/rules
@@ -14,7 +14,7 @@ override_dh_strip:
 	dh_strip --no-automatic-dbgsym
 
 override_dh_gencontrol:
-	dh_gencontrol -- "-Vrudder:deps=$(shell ../format-dependencies dpkg $(shell dpkg-parsechangelog -SVersion) rudder-agent rudder-relay rudder-api-client)"
+	dh_gencontrol -- "-Vrudder:deps=$(shell ../format-dependencies dpkg $(shell dpkg-parsechangelog -SVersion) rudder-agent rudder-relay)"
 
 override_dh_dwz: