diff --git a/ocre.spec b/ocre.spec index 4d19737..fab40a2 100644 --- a/ocre.spec +++ b/ocre.spec @@ -1,7 +1,7 @@ %define realversion %(echo %version | tr . _) Name: ocre Version: 0.043 -Release: 1mamba +Release: 2mamba Summary: o.c.r. easy (and free/libre) Group: Applications/Graphics Vendor: openmamba @@ -15,8 +15,8 @@ Source1: ftp://lem.eui.upm.es/pub/ocre/ocre-decsWood-%{version}.tgz Patch: ocre-0.029-Makefile.patch License: GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: aspell-devel BuildRequires: glibc-devel +BuildRequires: libaspell-devel BuildRequires: libatk-devel BuildRequires: libcairo-devel BuildRequires: libfontconfig-devel @@ -59,6 +59,13 @@ tar -xvzf %{SOURCE1} -C %{buildroot}%{_datadir}/ocre/ %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} +%pre +if [ $1 -ge 1 ]; then + # Became a symlink + [ -d %{_datadir}/ocre/decsWood ] && rmdir %{_datadir}/ocre/decsWood +fi +: + %files %defattr(-, root, root, 0755) %{_bindir}/ocre @@ -69,8 +76,7 @@ tar -xvzf %{SOURCE1} -C %{buildroot}%{_datadir}/ocre/ %{_datadir}/ocre/conv/puntua %{_datadir}/ocre/conv/tposyes %{_datadir}/ocre/conv/ts-8859-*.ts -%dir %{_datadir}/ocre/decsWood -%{_datadir}/ocre/decsWood/* +%{_datadir}/ocre/decsWood %dir %{_datadir}/ocre/decsWoodCur %{_datadir}/ocre/decsWoodCur/* %dir %{_datadir}/ocre/decsWoodCyrillic @@ -79,10 +85,13 @@ tar -xvzf %{SOURCE1} -C %{buildroot}%{_datadir}/ocre/ %{_datadir}/ocre/decsWoodLatin/* %dir %{_datadir}/ocre/decsWoodLatinW %{_datadir}/ocre/decsWoodLatinW/* -%{_mandir}/es/man1/ocre.1.gz -%{_mandir}/man1/ocre.1.gz +%{_mandir}/es/man1/ocre.1* +%{_mandir}/man1/ocre.1* %changelog +* Tue Oct 11 2016 Silvan Calarco 0.043-2mamba +- fix packaging of decsWood as symlink, not directory + * Tue Oct 11 2016 Automatic Build System 0.043-1mamba - automatic update by autodist