[koschei] Update to version 0.2

[Michael Šimáček]

commit fded6be32c1e7d98f9370150196ffb429e008a9a
Author: Michael Simacek <msimacek at redhat.com>
Date:   Thu Mar 12 16:47:02 2015 +0100

    Update to version 0.2

 .gitignore   |  1 +
 koschei.spec | 52 ++++++++++++++++++++++++++++++++++------------------
 sources      |  2 +-
 3 files changed, 36 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4deb408..c9c0384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /koschei-0.1.tar.gz
+/0.2.tar.gz
diff --git a/koschei.spec b/koschei.spec
index 76ff36e..587e6bc 100644
--- a/koschei.spec
+++ b/koschei.spec
@@ -1,12 +1,12 @@
 %bcond_without tests
 
 Name:           koschei
-Version:        0.1
-Release:        2%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Continuous integration for Fedora packages
 License:        GPLv2+
 URL:            https://github.com/msimacek/%{name}
-Source0:        https://github.com/msimacek/%{name}/archive/%{name}-%{version}.tar.gz
+Source0:        https://github.com/msimacek/%{name}/archive/%{version}.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -20,14 +20,23 @@ BuildRequires:       python-sqlalchemy
 BuildRequires:       koji
 BuildRequires:       python-hawkey
 BuildRequires:       python-librepo
-BuildRequires:       python-libcomps
 BuildRequires:       rpm-python
+%if %{?fedora} < 22
+BuildRequires:       dnf
+%else
+BuildRequires:       python-dnf
+%endif
+BuildRequires:       fedmsg
 %endif
 
+%if %{?fedora} < 22
+Requires:       dnf
+%else
+Requires:       python-dnf
+%endif
 Requires:       python-sqlalchemy
 Requires:       koji
 Requires:       fedmsg
-Requires:       postgresql-server
 Requires:       python-psycopg2
 Requires:       createrepo_c
 Requires:       curl
@@ -36,10 +45,10 @@ Requires:       python-hawkey
 Requires:       python-alembic
 Requires:       python-flask
 Requires:       python-flask-sqlalchemy
+Requires:       python-flask-openid
 Requires:       mod_wsgi
 Requires:       httpd
 Requires:       python-librepo
-Requires:       python-libcomps
 Requires:       rpm-python
 Requires(pre):  shadow-utils
 Requires(post): systemd
@@ -52,10 +61,11 @@ dependencies change too much. It uses Koji scratch builds to do the rebuilds and
 provides a web interface to the results.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q
 
 sed 's|@CACHEDIR@|%{_localstatedir}/cache/%{name}|g
-     s|@DATADIR@|%{_datadir}/%{name}|g' config.cfg.template > config.cfg
+     s|@DATADIR@|%{_datadir}/%{name}|g
+     s|@STATEDIR@|%{_sharedstatedir}/%{name}|g' config.cfg.template > config.cfg
 
 %build
 %{__python2} setup.py build
@@ -63,28 +73,30 @@ sed 's|@CACHEDIR@|%{_localstatedir}/cache/%{name}|g
 %install
 %{__python2} setup.py install --skip-build --root %{buildroot}
 
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-cp -p config.cfg %{buildroot}%{_sysconfdir}/%{name}/
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+
+cp -p empty_config.cfg %{buildroot}%{_sysconfdir}/%{name}/config.cfg
+cp -p config.cfg %{buildroot}%{_datadir}/koschei/
 
 install -dm 755 %{buildroot}%{_unitdir}
 for unit in systemd/*; do
     install -pm 644 $unit %{buildroot}%{_unitdir}/
 done
 
-mkdir -p %{buildroot}%{_bindir}
 install -pm 755 admin.py %{buildroot}%{_bindir}/%{name}-admin
 
 install -dm 755 %{buildroot}%{_localstatedir}/cache/%{name}/repodata
 install -dm 755 %{buildroot}%{_localstatedir}/cache/%{name}/srpms
+install -dm 755 %{buildroot}%{_sharedstatedir}/%{name}
 
-mkdir -p %{buildroot}%{_datadir}/%{name}
 cp -pr templates %{buildroot}%{_datadir}/%{name}/
 
 cp -pr alembic/ alembic.ini %{buildroot}%{_datadir}/%{name}/
-cp -pr theme %{buildroot}%{_datadir}/%{name}/
-ln -s theme/fedora/static %{buildroot}%{_datadir}/%{name}/static
+cp -pr static %{buildroot}%{_datadir}/%{name}/
 cp -p %{name}.wsgi %{buildroot}%{_datadir}/%{name}/
-mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 cp -p httpd.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 %if %{with tests}
@@ -113,16 +125,17 @@ exit 0
 %systemd_preun %{name}-resolver.service
 
 %postun
-%systemd_postun_with_restart %{name}-scheduler.service
-%systemd_postun_with_restart %{name}-watcher.service
-%systemd_postun_with_restart %{name}-polling.service
-%systemd_postun_with_restart %{name}-resolver.service
+%systemd_postun %{name}-scheduler.service
+%systemd_postun %{name}-watcher.service
+%systemd_postun %{name}-polling.service
+%systemd_postun %{name}-resolver.service
 
 %files
 %doc LICENSE.txt
 %{_bindir}/%{name}-admin
 %{_datadir}/%{name}
 %attr(755, %{name}, %{name}) %{_localstatedir}/cache/%{name}
+%attr(755, %{name}, %{name}) %{_sharedstatedir}/%{name}
 %{python2_sitelib}/*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/config.cfg
@@ -130,6 +143,9 @@ exit 0
 %{_unitdir}/*
 
 %changelog
+* Thu Mar 12 2015 Michael Simacek <msimacek at redhat.com> - 0.2-1
+- Update to version 0.2
+
 * Mon Sep 01 2014 Michael Simacek <msimacek at redhat.com> - 0.1-2
 - Fixed BR python-devel -> python2-devel
 - Fixed changelog format
diff --git a/sources b/sources
index 18afde7..873efe0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e29c0274cebfc125965e54f2cae80fb  koschei-0.1.tar.gz
+8a57c90268e08f5e2c5a7daa4aaa1c8f  0.2.tar.gz