Some directories were not removed on rpm -e due no declaration on %files section. Also, the directory was being created in runtime. Now, it is being created on rpm build. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; --- contrib/kimchi.spec.fedora.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index c1929f8..99dc153 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -83,6 +83,11 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install %if 0%{?with_systemd} + +# create directory +mkdir -p %{buildroot}/var/lib/kimchi/{isos,vnc-tokens}

+ + # Install the systemd scripts install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml @@ -148,7 +153,6 @@ exit 0 # Rollback SELinux rules semanage permissive -d httpd_t - %clean rm -rf $RPM_BUILD_ROOT @@ -162,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/xmlutils/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/kimchi/ %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/README-federation.md @@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml %{_datadir}/kimchi/ui/ +%{_datadir}/kimchi %{_sysconfdir}/kimchi/kimchi.conf %{_sysconfdir}/kimchi/nginx.conf.in %{_sysconfdir}/kimchi/distros.d/debian.json @@ -177,6 +183,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/kimchi/distros.d/opensuse.json %{_sysconfdir}/kimchi/distros.d/ubuntu.json %{_sysconfdir}/kimchi/distros.d/gentoo.json +%{_sysconfdir}/kimchi/ +%{_sharedstatedir}/kimchi/* %if 0%{?with_systemd} %{_unitdir}/kimchid.service

On 12/09/2014 01:16 AM, Royce Lv wrote: > Some nits below, hope the ubuntu one can be provided too. > which will involve change in postrm script. > > On 2014年12月09日 02:31, Ramon Medeiros wrote: >> Some directories were not removed on rpm -e due no declaration on >> %files >> section. Also, the directory was being created in runtime. Now, it is >> being created on rpm build. >> >> Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; >> --- >> contrib/kimchi.spec.fedora.in | 10 +++++++++- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/contrib/kimchi.spec.fedora.in >> b/contrib/kimchi.spec.fedora.in >> index c1929f8..99dc153 100644 >> --- a/contrib/kimchi.spec.fedora.in >> +++ b/contrib/kimchi.spec.fedora.in >> @@ -83,6 +83,11 @@ rm -rf %{buildroot} >> make DESTDIR=%{buildroot} install >> >> %if 0%{?with_systemd} >> + >> +# create directory >> +mkdir -p %{buildroot}/var/lib/kimchi/{isos,vnc-tokens} > Directory /var/lib/kimchi/isos is for out of box ISO storage pool, > This is a storage pool in libvirt and contain some ISOs user may want > to use. > I'm wandering do we need to remove this after kimchi is removed? > From what I understand, the directory /var/lib/kimchi/isos will be removed only if it is empty.

> BTW, seems /var/log/kimchi clean not included in this patch? >> + >> + >> # Install the systemd scripts >> install -Dm 0644 contrib/kimchid.service.fedora >> %{buildroot}%{_unitdir}/kimchid.service >> install -Dm 0640 src/firewalld.xml >> %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml >> @@ -148,7 +153,6 @@ exit 0 >> # Rollback SELinux rules >> semanage permissive -d httpd_t >> >> - >> %clean >> rm -rf $RPM_BUILD_ROOT >> >> @@ -162,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT >> %{python_sitelib}/kimchi/xmlutils/*.py* >> %{python_sitelib}/kimchi/API.json >> %{python_sitelib}/kimchi/plugins/*.py* >> +%{python_sitelib}/kimchi/ >> %{_datadir}/kimchi/doc/API.md >> %{_datadir}/kimchi/doc/README.md >> %{_datadir}/kimchi/doc/README-federation.md >> @@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT >> %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo >> %{_datadir}/kimchi/config/ui/*.xml >> %{_datadir}/kimchi/ui/ >> +%{_datadir}/kimchi >> %{_sysconfdir}/kimchi/kimchi.conf >> %{_sysconfdir}/kimchi/nginx.conf.in >> %{_sysconfdir}/kimchi/distros.d/debian.json >> @@ -177,6 +183,8 @@ rm -rf $RPM_BUILD_ROOT >> %{_sysconfdir}/kimchi/distros.d/opensuse.json >> %{_sysconfdir}/kimchi/distros.d/ubuntu.json >> %{_sysconfdir}/kimchi/distros.d/gentoo.json >> +%{_sysconfdir}/kimchi/ >> +%{_sharedstatedir}/kimchi/* >> >> %if 0%{?with_systemd} >> %{_unitdir}/kimchid.service > > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel

On 12/09/2014 02:09 PM, Ramon Medeiros wrote: > On 12/09/2014 10:18 AM, Aline Manera wrote: >> >> On 12/09/2014 01:16 AM, Royce Lv wrote: >>> Some nits below, hope the ubuntu one can be provided too. >>> which will involve change in postrm script. >>> >>> On 2014年12月09日 02:31, Ramon Medeiros wrote: >>>> Some directories were not removed on rpm -e due no declaration on >>>> %files >>>> section. Also, the directory was being created in runtime. Now, it is >>>> being created on rpm build. >>>> >>>> Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; >>>> --- >>>> contrib/kimchi.spec.fedora.in | 10 +++++++++- >>>> 1 file changed, 9 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/contrib/kimchi.spec.fedora.in >>>> b/contrib/kimchi.spec.fedora.in >>>> index c1929f8..99dc153 100644 >>>> --- a/contrib/kimchi.spec.fedora.in >>>> +++ b/contrib/kimchi.spec.fedora.in >>>> @@ -83,6 +83,11 @@ rm -rf %{buildroot} >>>> make DESTDIR=%{buildroot} install >>>> >>>> %if 0%{?with_systemd} >>>> + >>>> +# create directory >>>> +mkdir -p %{buildroot}/var/lib/kimchi/{isos,vnc-tokens} >>> Directory /var/lib/kimchi/isos is for out of box ISO storage pool, >>> This is a storage pool in libvirt and contain some ISOs user may >>> want to use. >>> I'm wandering do we need to remove this after kimchi is removed? >>> >> >> From what I understand, the directory /var/lib/kimchi/isos will be >> removed only if it is empty. >> > I run again and found more directories in /var/lib/kimchi: > ramonn@jarvis:~/Gittrees/KIMCHI (master *)$ ls /var/lib/kimchi/ > debugreports/ objectstore screenshots/ > > The rpm -e removed the directories isos and vnc-tokens with content. > > > About /var/log/kimchi, rpm -e is not removing it. So we are going to > remove /var/lib/kimchi only if directories are empty? Yeap! I think removing the /var/lib/kimchi only it is empty is the best approach as it might data other user data such as ISO files. > > The same for /var/log/kimchi ? We can remove it and all its content.

> >>> BTW, seems /var/log/kimchi clean not included in this patch? >>>> + >>>> + >>>> # Install the systemd scripts >>>> install -Dm 0644 contrib/kimchid.service.fedora >>>> %{buildroot}%{_unitdir}/kimchid.service >>>> install -Dm 0640 src/firewalld.xml >>>> %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml >>>> @@ -148,7 +153,6 @@ exit 0 >>>> # Rollback SELinux rules >>>> semanage permissive -d httpd_t >>>> >>>> - >>>> %clean >>>> rm -rf $RPM_BUILD_ROOT >>>> >>>> @@ -162,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT >>>> %{python_sitelib}/kimchi/xmlutils/*.py* >>>> %{python_sitelib}/kimchi/API.json >>>> %{python_sitelib}/kimchi/plugins/*.py* >>>> +%{python_sitelib}/kimchi/ >>>> %{_datadir}/kimchi/doc/API.md >>>> %{_datadir}/kimchi/doc/README.md >>>> %{_datadir}/kimchi/doc/README-federation.md >>>> @@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT >>>> %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo >>>> %{_datadir}/kimchi/config/ui/*.xml >>>> %{_datadir}/kimchi/ui/ >>>> +%{_datadir}/kimchi >>>> %{_sysconfdir}/kimchi/kimchi.conf >>>> %{_sysconfdir}/kimchi/nginx.conf.in >>>> %{_sysconfdir}/kimchi/distros.d/debian.json >>>> @@ -177,6 +183,8 @@ rm -rf $RPM_BUILD_ROOT >>>> %{_sysconfdir}/kimchi/distros.d/opensuse.json >>>> %{_sysconfdir}/kimchi/distros.d/ubuntu.json >>>> %{_sysconfdir}/kimchi/distros.d/gentoo.json >>>> +%{_sysconfdir}/kimchi/ >>>> +%{_sharedstatedir}/kimchi/* >>>> >>>> %if 0%{?with_systemd} >>>> %{_unitdir}/kimchid.service >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> > >