1
0
forked from pool/roundcubemail

Accepting request 223707 from home:aeneas_jaissle:branches:server:php:applications

Dropped SQL_dir.patch, it's way easier to maintain to just create a symlink.

OBS-URL: https://build.opensuse.org/request/show/223707
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=68
This commit is contained in:
Wolfgang Rosenauer
2014-02-25 08:18:55 +00:00
committed by Git OBS Bridge
parent 73ec261687
commit 1c8a32a34f
2 changed files with 10 additions and 3 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 24 14:02:07 UTC 2014 - aj@ajaissle.de
- Dropped SQL_dir.patch, it's way easier to maintain to just create
a symlink.
-------------------------------------------------------------------
Fri Jan 10 17:54:21 UTC 2014 - aj@ajaissle.de

View File

@@ -31,8 +31,6 @@ Source4: README.openSUSE
Source5: %{name}.logrotate
# PATCH-FIX-OPENSUSE roundcubemail-0.9.1_config-dir.patch -- use the general config directory /etc
Patch0: %{name}-0.9.1_config-dir.patch
# PATCH-FIX-OPENSUSE 0.9.5_SQL_dir.patch -- SQL files are located in _docdir
Patch1: %{name}-0.9.5_SQL_dir.patch
BuildArch: noarch
BuildRequires: apache2-devel
@@ -91,7 +89,6 @@ The user interface is fully skinnable using XHTML and CSS 2.
%prep
%setup -q -n %{name}-%{version}-dep
%patch0 -p1
%patch1 -p1
cp %{SOURCE4} .
cp %{SOURCE5} .
@@ -157,6 +154,9 @@ for i in CHANGELOG UPGRADING LICENSE README.md README.openSUSE SQL; do
mv -v %{buildroot}%{roundcubepath}/$i %{buildroot}%{_defaultdocdir}/%{name}/
done
# create a link for SQL
%{__ln_s} %{_defaultdocdir}/%{name}/SQL %{buildroot}%{roundcubepath}/SQL
# fdupes
%if 0%{suse_version} >= 1100
%fdupes %{buildroot}%{roundcubepath}
@@ -274,6 +274,7 @@ exit 0
%{roundcubepath}/plugins/
%{roundcubepath}/program/
%{roundcubepath}/skins/
%{roundcubepath}/SQL
%{roundcubepath}/temp
%dir %{_datadir}/php5
%{_datadir}/php5/Roundcube/