Author: glen Date: Tue Aug 5 15:35:32 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- simplify, cosmetics
---- Files affected:
SPECS:
roundcubemail.spec (1.68 -> 1.69)
---- Diffs:
================================================================
Index: SPECS/roundcubemail.spec
diff -u SPECS/roundcubemail.spec:1.68 SPECS/roundcubemail.spec:1.69
--- SPECS/roundcubemail.spec:1.68 Tue Aug 5 14:42:25 2008
+++ SPECS/roundcubemail.spec Tue Aug 5 17:35:27 2008
@@ -10,21 +10,22 @@
%bcond_with spamfilter # Build with spamfilter patch
%bcond_with postfixadmin # Build with postfixadmin support patch
-%define _rc alpha
-%define _rcpfa_ver 1.0.3
+%define subver alpha
+%define rcpfa_ver 1.0.3
+%define rel 3
Summary: RoundCube Webmail
Summary(pl.UTF-8): RoundCube Webmail - poczta przez WWW
Name: roundcubemail
Version: 0.2
-Release: 0.%{_rc}.3
+Release: 0.%{subver}.%{rel}
License: GPL v2
Group: Applications/WWW
-Source0:
http://dl.sourceforge.net/roundcubemail/%{name}-%{version}-%{_rc}.1.tar.gz
+Source0:
http://dl.sourceforge.net/roundcubemail/%{name}-%{version}-%{subver}.1.tar.gz
# Source0-md5: 033fe78ea4b3b8330e13681a18b0e771
Source1: %{name}.config
Source2: %{name}.logrotate
Source3: %{name}-lighttpd.conf
-Source4: http://nejc.skoberne.net/rcpfa/rcpfa-%{_rcpfa_ver}.tgz
+Source4: http://nejc.skoberne.net/rcpfa/rcpfa-%{rcpfa_ver}.tgz
Patch0: %{name}-config.patch
Patch1: %{name}-faq-page.patch
Patch2: %{name}-tz.patch
@@ -100,7 +101,7 @@
Domyślna skórka dla RoundCube Webmaila.
%prep
-%setup -q -n %{name}-%{version}-%{_rc} %{?with_postfixadmin:-a 4}
+%setup -q -n %{name}-%{version}-%{subver} %{?with_postfixadmin:-a 4}
%patch0 -p1
#%patch1 -p1 need to rewrite
%patch2 -p1
@@ -119,24 +120,25 @@
mv config/db.inc.php.dist config/db.inc.php
mv config/main.inc.php.dist config/main.inc.php
%if %{with postfixadmin}
-cp rcpfa-%{_rcpfa_ver}/code/forwarding.html skins/default/templates
-cp rcpfa-%{_rcpfa_ver}/code/password.html skins/default/templates
-cp rcpfa-%{_rcpfa_ver}/code/vacation.html skins/default/templates
-cp rcpfa-%{_rcpfa_ver}/code/pfa_forwarding.inc program/steps/settings
-cp rcpfa-%{_rcpfa_ver}/code/pfa_password.inc program/steps/settings
-cp rcpfa-%{_rcpfa_ver}/code/pfa_vacation.inc program/steps/settings
-cp rcpfa-%{_rcpfa_ver}/code/pfa.php program/include
-
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/app.js.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/db.inc.php.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/func.inc.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/index.php.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/labels.inc.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/main.inc.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/main.inc.php.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/messages.inc.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/rcube_user.php.diff
-patch -p1 < rcpfa-%{_rcpfa_ver}/diffs/settingstabs.html.diff
+mv rcpfa-%{rcpfa_ver} rcpfa
+cp rcpfa/code/forwarding.html skins/default/templates
+cp rcpfa/code/password.html skins/default/templates
+cp rcpfa/code/vacation.html skins/default/templates
+cp rcpfa/code/pfa_forwarding.inc program/steps/settings
+cp rcpfa/code/pfa_password.inc program/steps/settings
+cp rcpfa/code/pfa_vacation.inc program/steps/settings
+cp rcpfa/code/pfa.php program/include
+
+patch -p1 < rcpfa/diffs/app.js.diff
+patch -p1 < rcpfa/diffs/db.inc.php.diff
+patch -p1 < rcpfa/diffs/func.inc.diff
+patch -p1 < rcpfa/diffs/index.php.diff
+patch -p1 < rcpfa/diffs/labels.inc.diff
+patch -p1 < rcpfa/diffs/main.inc.diff
+patch -p1 < rcpfa/diffs/main.inc.php.diff
+patch -p1 < rcpfa/diffs/messages.inc.diff
+patch -p1 < rcpfa/diffs/rcube_user.php.diff
+patch -p1 < rcpfa/diffs/settingstabs.html.diff
%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -319,6 +321,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.69 2008/08/05 15:35:27 glen
+- simplify, cosmetics
+
Revision 1.68 2008/08/05 12:42:25 luzik
- rcpfa 1.0.3
- rel. .3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/roundcubemail.spec?r1=1.68&r2=1.69&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
