Attachment 154419 Details for Bug 225575 – cleanups and fixes

[patch] cleanups and fixes

roundcubemail.spec.diff (text/plain), 3.83 KB, created by Bernard Johnson on 2007-05-09 19:28:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Johnson

Created: 2007-05-09 19:28:18 UTC

Size: 3.83 KB

patch

obsolete

>--- roundcubemail.spec.orig	2007-05-09 12:16:22.000000000 -0600
>+++ roundcubemail.spec	2007-05-09 13:19:47.000000000 -0600
>@@ -1,7 +1,7 @@
> %define roundcubedir %{_datadir}/roundcubemail
> Name: roundcubemail
> Version:  0.1
>-Release:  beta2.2%{?dist}.3
>+Release:  0.1.beta2.2%{?dist}
> Summary: Round Cube Webmail is a browser-based multilingual IMAP client
> 
> Group: Applications/System         
>@@ -37,63 +37,51 @@
> %prep
> %setup -q -n roundcubemail-0.1beta2
> find . -type f -print | xargs chmod a-x
>+find . -name \.htaccess -print | xargs rm -f
> 
>-sed -i 's|temp/|/var/tmp/|' config/main.inc.php.dist
>+sed -i 's|temp/|%{_tmppath}|' config/main.inc.php.dist
> sed -i 's|config/|%{_sysconfdir}/roundcubemail/|' config/main.inc.php.dist
> sed -i 's|logs/|%{_logdir}/roundcubemail/|' program/include/main.inc
>+sed -i 's|config/|%{_sysconfdir}/roundcubemail/|' program/include/main.inc
> 
> %build
> 
> %install
> rm -rf %{buildroot}
>+
> install -d %{buildroot}%{roundcubedir}
> cp -pr * %{buildroot}%{roundcubedir}
>-mkdir -p %{buildroot}%{_sysconfdir}/httpd
>+
> mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
> cp -pr %SOURCE1 %{buildroot}%{_sysconfdir}/httpd/conf.d
>+
> mkdir -p %{buildroot}%{_sysconfdir}/roundcubemail
> mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
> cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
>-rm %{buildroot}%{roundcubedir}/config/.htaccess
>-rm %{buildroot}%{roundcubedir}/logs/.htaccess
>-rm %{buildroot}%{roundcubedir}/temp/.htaccess
>-mv %{buildroot}%{roundcubedir}/config/*.dist %{buildroot}%{_sysconfdir}/roundcubemail
>-rmdir %{buildroot}%{roundcubedir}/config
>-#ln -s ../../../%{_sysconfdir}/roundcubemail %{buildroot}%{roundcubedir}/config
>+
> mkdir -p %{buildroot}/var/log/roundcubemail
>-rmdir %{buildroot}%{roundcubedir}/logs
>-rmdir %{buildroot}%{roundcubedir}/temp
>-#ln -s ../../../var/log/roundcubemail %{buildroot}%{roundcubedir}/logs
>-#ln -s ../../../var/tmp %{buildroot}%{roundcubedir}/temp
>-rm %{buildroot}%{roundcubedir}/CHANGELOG
>-rm %{buildroot}%{roundcubedir}/INSTALL
>-rm %{buildroot}%{roundcubedir}/LICENSE
>-rm %{buildroot}%{roundcubedir}/README
>-rm %{buildroot}%{roundcubedir}/UPGRADING
>-rm -rf %{buildroot}%{roundcubedir}/SQL
>-mv %{buildroot}%{_sysconfdir}/roundcubemail/db.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/db.inc.php
>-mv %{buildroot}%{_sysconfdir}/roundcubemail/main.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/main.inc.php
>-#chmod 644 SQL/postgres.initial.sql
>-#chmod 644 program/include/rcube_db.inc
>-#chmod 644 program/js/googiespell.js
>-#chmod 644 skins/default/common.css
>-#chmod 644 skins/default/googiespell.css
>-#chmod 644 program/include/rcube_mdb2.inc
>+
>+# use dist files as config files
>+mv %{buildroot}%{roundcubedir}/config/db.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/db.inc.php
>+mv %{buildroot}%{roundcubedir}/config/main.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/main.inc.php
>+
>+# clean up the buildroot
>+rm -rf %{buildroot}%{roundcubedir}/{config,logs,temp}
>+rm -rf %{buildroot}%{roundcubedir}/{CHANGELOG,INSTALL,LICENSE,README,UPGRADING,SQL}
>+
> 
> %clean
> rm -rf %{buildroot}
> 
> %files
>-%defattr(-,root,root)
>+%defattr(-,root,root,-)
> %doc CHANGELOG INSTALL LICENSE README UPGRADING SQL
>-%dir %{roundcubedir}
>-%{roundcubedir}/*
>-%dir %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/%{name}
>-%attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*
>-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/httpd/conf.d/roundcubemail.conf
>-
>+%{roundcubedir}
>+%dir %{_sysconfdir}/%{name}
>+%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/*
>+%config(noreplace) %{_sysconfdir}/httpd/conf.d/roundcubemail.conf
> %attr(0775,root,apache) %dir /var/log/roundcubemail
>-%config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
>+%dir %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
> 
> %changelog
> * Mon May 07 2007 Jon Ciesla <limb@jcomserv.net> - 0.1-beta2.2.3

Actions: View | Diff

Attachments on bug 225575: 154419 | 154428 | 154507