[aeolus-conductor/f16] upstream release for aeolus-conductor 0.4.0

[Scott Seago]

commit e4980f3e9b1d0548cedd7d8d08d9e1436029cde4
Author: Scott Seago <sseago at redhat.com>
Date:   Tue Oct 11 16:03:32 2011 -0400

    upstream release for aeolus-conductor 0.4.0

 .gitignore            |    1 +
 aeolus-conductor.spec |   59 +++++++++++++++++++++++++------------------------
 sources               |    2 +-
 3 files changed, 32 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80e7271..4114f6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /aeolus-conductor-0.3.0.tar.gz
 /aeolus-conductor-0.4.0-git101cab5693.tar.gz
 /aeolus-conductor-0.4.0-gitb6e37f9738.tar.gz
+/aeolus-conductor-0.4.0.tar.gz
diff --git a/aeolus-conductor.spec b/aeolus-conductor.spec
index 1bebb1e..58ce779 100644
--- a/aeolus-conductor.spec
+++ b/aeolus-conductor.spec
@@ -1,11 +1,9 @@
 %global app_root %{_datadir}/%{name}
 %global doc_root %{_datadir}/%{name}-doc
 
-%global alphatag gitb6e37f9738
-
 Name:     aeolus-conductor
 Version:  0.4.0
-Release:  0.2%{alphatag}%{?dist}%{?extra_release}
+Release:  1%{?dist}
 Summary:  The Aeolus Conductor
 
 Group:    Applications/System
@@ -13,12 +11,11 @@ License:  GPLv2+ and MIT and BSD
 URL:      http://aeolusproject.org
 
 # to build source tarball
-# git clone git://git.fedorahosted.org/aeolus/conductor.git
-# cd conductor
-# git checkout b6e37f9738747cf848cbc94e3c2dcff819af3092
+# git clone  git://git.fedorahosted.org/aeolus/conductor.git
+# git checkout v0.3.0_RC_1
 # make dist
 # cp aeolus-conductor-0.4.0.tar.gz ~/rpmbuild/SOURCES
-Source0:    aeolus-conductor-%{version}-%{alphatag}.tar.gz
+Source0:    aeolus-conductor-%{version}.tar.gz
 
 Requires: ruby >= 1.8.1
 Requires: ruby(abi) = 1.8
@@ -26,13 +23,8 @@ Requires: rubygem(rails) >= 3.0.7
 Requires: rubygem(haml) >= 3.1
 Requires: rubygem(nokogiri) >= 1.4.0
 Requires: rubygem(will_paginate) >= 3.0
-Requires: rubygem(parseconfig)
-Requires: rubygem(authlogic) >= 3.0.2
-Requires: rubygem(deltacloud-client) >= 0.0.9.8
-Requires: rubygem(compass) >= 0.10.2
-Requires: rubygem(compass-960-plugin)
+Requires: rubygem(deltacloud-client) >= 0.4.0
 Requires: rubygem(simple-navigation)
-Requires: rubygem(typhoeus)
 Requires: rubygem(rest-client) >= 1.6.1
 Requires: rubygem(builder)
 Requires: rubygem(json)
@@ -40,17 +32,19 @@ Requires: rubygem(rack-restful_submit)
 Requires: rubygem(uuidtools)
 Requires: rubygem(sqlite3)
 Requires: rubygem(fastercsv)
+Requires: rubygem(rails_warden)
+Requires: rubygem(aeolus-image)
 Requires: rubygem(pg)
+Requires: rubygem(ruby-net-ldap)
+Requires: rubygem(oauth)
 Requires: postgresql
 Requires: postgresql-server
-Requires: ruby-postgres
 
 # to ensure the service is actually started
 # and is accessible in the init script
 Requires: curl
 
-BuildRequires: rubygem(compass) >= 0.10.2
-BuildRequires: rubygem(compass-960-plugin)
+BuildRequires: rubygem(sass)
 
 BuildArch: noarch
 
@@ -87,12 +81,14 @@ Requires: rubygem(cucumber)
 Requires: rubygem(rspec)
 Requires: rubygem(timecop)
 Requires: rubygem(cucumber-rails)
-Requires: rubygem(rspec-rails) >= 2.0.1
-Requires: rubygem(webrat) >= 0.7.2
+Requires: rubygem(rspec-rails) >= 2.6.1
+Requires: rubygem(capybara) >= 1.0.0
 Requires: rubygem(database_cleaner) >= 0.5.0
 Requires: rubygem(factory_girl)
 Requires: rubygem(vcr)
 Requires: rubygem(factory_girl_rails)
+Requires: rubygem(webmock)
+Requires: rubygem(launchy)
 
 %description devel
 Tests and other development tools for the Aeolus Conductor.
@@ -141,7 +137,8 @@ haml="app/views/hardware_profiles app/views/realm_mappings \
       app/views/quotas app/views/permissions \
       app/views/deployments app/views/pools \
       app/views/instances app/views/user_sessions \
-      app/views/catalog_entries app/views/catalogs"
+      app/views/catalog_entries app/views/catalogs \
+      app/views/provider_types"
 html="public"
 ico="public"
 jpg="public/images public/stylesheets/images"
@@ -156,11 +153,10 @@ png="public/images public/images/icons public/stylesheets/images \
      public/stylesheets/jquery.ui-1.8.1/images"
 rake="lib/tasks"
 rb="app/models app/controllers app/helpers app/services app/util config \
-    config/initializers config/environments db db/migrate dutils \
+    config/initializers config/environments db db/migrate \
     features/support features/step_definitions lib spec spec/controllers \
     spec/factories spec/helpers spec/models spec/services"
 rhtml="app/views/layouts"
-scss="app/stylesheets"
 svg="public/images public/images/icons public/javascripts/jquery-svg"
 ttf="public/fonts"
 txt="public"
@@ -177,15 +173,15 @@ for filetype in builder css feature gif haml html ico jpg js json key opts png \
 done
 
 # precompile stylesheets
-cd src
-compass compile --output-style compact
-%{__mv} public/stylesheets/compiled %{buildroot}%{app_root}/public/stylesheets/
-cd ..
+%{__mkdir} %{buildroot}%{app_root}/public/stylesheets/compiled
+sass --style compact ./src/app/stylesheets/application.scss %{buildroot}%{app_root}/public/stylesheets/compiled/application.css
+sass --style compact ./src/app/stylesheets/custom.scss %{buildroot}%{app_root}/public/stylesheets/compiled/custom.css
+sass --style compact ./src/app/stylesheets/layout.scss %{buildroot}%{app_root}/public/stylesheets/compiled/layout.css
+sass --style compact ./src/app/stylesheets/login.scss %{buildroot}%{app_root}/public/stylesheets/compiled/login.css
 
 # misc files
 %{__cp} src/Rakefile %{buildroot}%{app_root}
 %{__cp} src/config.ru %{buildroot}%{app_root}
-%{__cp} src/Gemfile %{buildroot}%{app_root}
 
 %{__mkdir} -p %{buildroot}%{app_root}/config
 %{__cp} src/config/database.pg %{buildroot}%{app_root}/config
@@ -209,6 +205,8 @@ cd ..
 %{__cp} conf/aeolus-conductor.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/aeolus-conductor
 %{__cp} conf/aeolus-conductor.sysconf %{buildroot}%{_sysconfdir}/sysconfig/aeolus-conductor
 %{__cp} conf/conductor-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/conductor-rails
+%{__mkdir} -p %{buildroot}%{_libdir}/../lib/tmpfiles.d
+%{__cp} conf/aeolus-tmpfiles.conf %{buildroot}%{_libdir}/../lib/tmpfiles.d/aeolus.conf
 
 %{__mkdir} -p %{buildroot}%{app_root}/config/image_descriptor_xmls
 
@@ -219,7 +217,6 @@ cd ..
 touch %{buildroot}%{_localstatedir}/log/%{name}/thin.log
 touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log
 touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
-touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
 
 %{__mkdir} -p %{buildroot}%{app_root}/log
 
@@ -237,6 +234,7 @@ touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
 %{__ln_s} -f %{app_root}/config/environments/production.rb %{_sysconfdir}/%{name}
 %{__ln_s} -f %{app_root}/config/environments/test.rb %{_sysconfdir}/%{name}
 %{__ln_s} -f %{app_root}/config/database.yml %{_sysconfdir}/%{name}
+%{__ln_s} -f %{app_root}/config/settings.yml %{_sysconfdir}/%{name}
 
 %postun
 # kind of a weird construct.  There are two cases where postun gets called;
@@ -250,6 +248,7 @@ if [ ! -d %{app_root}/app ]; then
    rm -f %{_sysconfdir}/%{name}/production.rb
    rm -f %{_sysconfdir}/%{name}/test.rb
    rm -f %{_sysconfdir}/%{name}/database.yml
+   rm -f %{_sysconfdir}/%{name}/settings.yml
 fi
 
 %post daemons
@@ -272,12 +271,10 @@ fi
 %{app_root}/config.ru
 %{app_root}/db
 %{app_root}/dbomatic
-%{app_root}/dutils
 %{app_root}/lib
 %{app_root}/log
 %{app_root}/public
 %{app_root}/Rakefile
-%{app_root}/Gemfile
 %config %{_sysconfdir}/%{name}
 %doc AUTHORS COPYING
 
@@ -292,6 +289,7 @@ fi
 %attr(-, aeolus, aeolus) %{_localstatedir}/run/%{name}
 %attr(-, aeolus, aeolus) %{_localstatedir}/log/%{name}
 %doc AUTHORS COPYING
+%{_libdir}/../lib/tmpfiles.d/aeolus.conf
 
 %files doc
 %{doc_root}
@@ -303,6 +301,9 @@ fi
 %{app_root}/spec
 
 %changelog
+* Tue Oct 11 2011 Scott Seago <sseago at redhat.com> - 0.4.0-1
+- New upstream release
+
 * Thu Sep 08 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-2
 - Update to latest upstream to pull in many fixes
 
diff --git a/sources b/sources
index 5624151..cf8792c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6018c049879d534e47201969dbc9b3a1  aeolus-conductor-0.4.0-gitb6e37f9738.tar.gz
+b1844a70d0e847ca3f9fbb7b80397d2d  aeolus-conductor-0.4.0.tar.gz