simplify db/schema.rb handling

just move it to /etc and keep symlink in original place

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 418086c8d4092dbbb26157f78ace5966f90a22c9..ad5dee77f46c51c22a841884452dfb9a2525386f 100644 (file)
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,7 +17,7 @@
 Summary:       A Web interface to create projects and repositories, manage access and do code reviews
 Name:          gitlab-ce
 Version:       8.10.6
-Release:       0.51
+Release:       0.52
 License:       MIT
 Group:         Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -217,8 +217,12 @@ move_config() {
 for f in gitlab.yml unicorn.rb database.yml; do
        move_config %{homedir}/config/$f %{_sysconfdir}/gitlab/$f
 done
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/gitlab/skip-auto-migrations
 
+# relocate to /etc as it's updated runtime, see 77cff54
+move_config %{homedir}/db/schema.rb %{_sysconfdir}/gitlab/schema.rb
+
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{systemdunitdir},%{systemdtmpfilesdir}} \
        $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,httpd/webapps.d}
 
@@ -296,6 +300,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/database.yml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/gitlab.yml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/unicorn.rb
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitlab/schema.rb
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/webapps.d/gitlab.conf
 %ghost %{_sysconfdir}/gitlab/skip-auto-migrations
 /etc/logrotate.d/gitlab.logrotate
@@ -316,16 +321,11 @@ fi
 %dir %attr(755,%{uname},%{gname}) %{homedir}/builds
 %dir %attr(755,%{uname},%{gname}) %{homedir}/config
 %attr(-,%{uname},%{gname}) %{homedir}/config/*
+%{homedir}/db
 %{homedir}/fixtures
 %{homedir}/generator_templates
 %{homedir}/lib
 
-%dir %{homedir}/db
-%attr(-,%{uname},%{gname}) %{homedir}/db/schema.rb
-%{homedir}/db/seeds.rb
-%{homedir}/db/fixtures
-%{homedir}/db/migrate
-
 %dir %{homedir}/public
 %{homedir}/public/ci
 %{homedir}/public/*.*