Merge pull request Normation#113 from nperron/bug_3897/int/fix_useles…

…s_dependencies_rudder_webapp Fixes #3897 - Remove useless dependencies of rudder-webapp package
amousset · Aug 30, 2013 · 8705c62 · 8705c62
2 parents 60c9e85 + 54cd05f
commit 8705c62
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/rudder-webapp/SOURCES/.dependencies b/rudder-webapp/SOURCES/.dependencies
@@ -1,3 +1 @@
 JAVA:jdk
-SLES11:asciidoc ImageMagick graphviz
-RHEL6:asciidoc ImageMagick graphviz
diff --git a/rudder-webapp/SPECS/rudder-webapp.spec b/rudder-webapp/SPECS/rudder-webapp.spec
@@ -84,7 +84,7 @@ Source5: rudder-upgrade
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires: jdk >= 1.6 asciidoc ImageMagick graphviz
+BuildRequires: jdk >= 1.6
 Requires: rudder-jetty rudder-inventory-ldap rudder-inventory-endpoint rudder-reports rudder-techniques %{apache} %{apache_tools} git-core rsync
 
 %description

diff --git a/rudder-webapp/debian/control b/rudder-webapp/debian/control
@@ -2,7 +2,7 @@ Source: rudder-webapp
 Section: web
 Priority: extra
 Maintainer: Nicolas Perron <nicolas.perron@normation.com>
-Build-Depends: debhelper (>= 7), sun-java6-jdk | java7-jdk, graphviz, inkscape, imagemagick
+Build-Depends: debhelper (>= 7), sun-java6-jdk | java7-jdk
 Standards-Version: 3.8.0
 Homepage: http://www.rudder-project.org