1c84ddd
diff -up src/bin/pdepend.rpm src/bin/pdepend
1c84ddd
--- src/bin/pdepend.rpm	2015-07-02 08:09:31.386769752 +0200
1c84ddd
+++ src/bin/pdepend	2015-07-02 08:09:38.708807234 +0200
1c84ddd
@@ -43,17 +43,7 @@
1c84ddd
 
1c84ddd
 use PDepend\TextUI\Command;
1c84ddd
 
1c84ddd
-// PEAR/svn workaround
1c84ddd
-if (strpos('@php_bin@', '@php_bin') === 0) {
1c84ddd
-    set_include_path('.' . PATH_SEPARATOR . dirname(__FILE__) . '/../main/php');
1c84ddd
-}
1c84ddd
-
1c84ddd
-// check for pdepend installed as composer package
1c84ddd
-if (file_exists(__DIR__ . '/../../../../autoload.php')) {
1c84ddd
-    require_once __DIR__ . '/../../../../autoload.php';
1c84ddd
-} else {
1c84ddd
-    require_once __DIR__ . '/../../vendor/autoload.php';
1c84ddd
-}
1c84ddd
+require '/usr/share/php/PDepend/autoload.php';
1c84ddd
 
1c84ddd
 // Allow as much memory as possible by default
1c84ddd
 if (extension_loaded('suhosin') && is_numeric(ini_get('suhosin.memory_limit'))) {
1c84ddd
diff -up src/main/php/PDepend/Application.php.rpm src/main/php/PDepend/Application.php
1c84ddd
--- src/main/php/PDepend/Application.php.rpm	2015-07-02 08:26:18.911899973 +0200
1c84ddd
+++ src/main/php/PDepend/Application.php	2015-07-02 08:27:25.327236899 +0200
1c84ddd
@@ -136,7 +136,7 @@ class Application
1c84ddd
         $container->prependExtensionConfig('pdepend', array());
1c84ddd
         $container->addCompilerPass(new DependencyInjection\Compiler\ProcessListenerPass());
1c84ddd
 
1c84ddd
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../resources'));
1c84ddd
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../../php-pdepend-PHP-Depend/resources'));
1c84ddd
 
1c84ddd
         foreach ($extensions as $extension) {
1c84ddd
             $container->registerExtension($extension);
1c84ddd
diff -up src/main/php/PDepend/DependencyInjection/PdependExtension.php.rpm src/main/php/PDepend/DependencyInjection/PdependExtension.php
1c84ddd
--- src/main/php/PDepend/DependencyInjection/PdependExtension.php.rpm	2015-07-02 08:27:39.270307644 +0200
1c84ddd
+++ src/main/php/PDepend/DependencyInjection/PdependExtension.php	2015-07-02 08:29:02.808731429 +0200
1c84ddd
@@ -80,7 +80,7 @@ class PdependExtension extends SymfonyEx
1c84ddd
         $configuration = new Configuration($extensionManager->getActivatedExtensions());
1c84ddd
         $config = $this->processConfiguration($configuration, $configs);
1c84ddd
 
1c84ddd
-        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../resources'));
1c84ddd
+        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../../../php-pdepend-PHP-Depend/resources'));
1c84ddd
         $loader->load('services.xml');
1c84ddd
 
1c84ddd
         foreach ($extensionManager->getActivatedExtensions() as $extension) {