packages: roundcubemail/roundcubemail.spec - use plain tarball without extr...

Fri Apr 20 19:12:19 CEST 2012

Author: glen                         Date: Fri Apr 20 17:12:19 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use plain tarball without extra deps; instead of removing downloading and removing them again

---- Files affected:
packages/roundcubemail:
   roundcubemail.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.127 packages/roundcubemail/roundcubemail.spec:1.128

--- packages/roundcubemail/roundcubemail.spec:1.127	Fri Apr 20 18:58:09 2012
+++ packages/roundcubemail/roundcubemail.spec	Fri Apr 20 19:12:14 2012
@@ -25,8 +25,9 @@
 Release:	1
 License:	GPL v3+
 Group:		Applications/Mail
-Source0:	http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}.tar.gz
-# Source0-md5:	529bd9131e796e368b68b9aec9c885d0
+#Source0:	http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}-dep.tar.gz
+# Source0-md5:	2b77fe823de00a7ebd85b8919e40d78d
 Source1:	apache.conf
 Source2:	%{name}.logrotate
 Source3:	lighttpd.conf
@@ -143,7 +144,7 @@
 Domyślna skórka dla RoundCube Webmaila.
 
 %prep
-%setup -q %{?with_postfixadmin:-a 4}
+%setup -q -n %{name}-%{version}-dep %{?with_postfixadmin:-a 4}
 %patch0 -p1
 %if %{with spamfilter}
 %patch1 -p1
@@ -174,44 +175,12 @@
 # tools to pack js
 rm -f bin/{jsshrink,jsunshrink}
 
-# rm utf8.class and deps, we use iconv extension
-rm program/lib/utf8.class.php
-rm -r program/lib/encoding
-
-# php-pear-PEAR-core 1.9.0 (used indirectly)
-rm program/lib/PEAR.php
-rm program/lib/PEAR5.php
-
-# php-pear-Net_Socket 1.0.9 (used by password, managesieve plugins)
-rm program/lib/Net/Socket.php
-
-# php-pear-Net_SMTP 1.4.2 (nothing seem to use it)
-rm program/lib/Net/SMTP.php
-
-# php-pear-Auth_SASL 1.0.4 (used by managesieve)
-rm program/lib/Auth/SASL.php
-rm -r program/lib/Auth/SASL
-
-# php-pear-Mail_Mime 1.8.0 (nothing seems to use it)
-rm program/lib/Mail/mime.php
-rm program/lib/Mail/mimePart.php
-
 # php-pear-Net_Sieve 1.3.0
 rm plugins/managesieve/lib/Net/Sieve.php
 
-# 0.1.1 snapshot (at least r301175)
-rm program/lib/Net/IDNA2.php
-rm -r program/lib/Net/IDNA2
-
 # now empty dirs
-rmdir program/lib/Auth
-rmdir program/lib/Mail
-rmdir program/lib/Net
 rmdir plugins/managesieve/lib/Net
 
-# unknown MDB2 version (newer than released 2.5.0b2, or modified by rc)
-#rm program/lib/MDB2.php
-
 # pear package junk
 rm -v plugins/*/package.xml
 
@@ -220,24 +189,24 @@
 %if %{with postfixadmin}
 mv rcpfa-%{rcpfa_ver} rcpfa
 cd rcpfa
-cp code/forwarding.html ../skins/default/templates
-cp code/password.html ../skins/default/templates
-cp code/vacation.html ../skins/default/templates
-cp code/pfa_forwarding.inc ../program/steps/settings
-cp code/pfa_password.inc ../program/steps/settings
-cp code/pfa_vacation.inc ../program/steps/settings
-cp code/pfa.php ../program/include
-
-patch -d .. -p1 < diffs/app.js.diff
-patch -d .. -p1 < diffs/db.inc.php.diff
-patch -d .. -p1 < diffs/func.inc.diff
-patch -d .. -p1 < diffs/index.php.diff
-patch -d .. -p1 < diffs/labels.inc.diff
-patch -d .. -p1 < diffs/main.inc.diff
-patch -d .. -p1 < diffs/main.inc.php.diff
-patch -d .. -p1 < diffs/messages.inc.diff
-patch -d .. -p1 < diffs/rcube_user.php.diff
-patch -d .. -p1 < diffs/settingstabs.html.diff
+cp -p code/forwarding.html ../skins/default/templates
+cp -p code/password.html ../skins/default/templates
+cp -p code/vacation.html ../skins/default/templates
+cp -p code/pfa_forwarding.inc ../program/steps/settings
+cp -p code/pfa_password.inc ../program/steps/settings
+cp -p code/pfa_vacation.inc ../program/steps/settings
+cp -p code/pfa.php ../program/include
+
+%{__patch} -d .. -p1 < diffs/app.js.diff
+%{__patch} -d .. -p1 < diffs/db.inc.php.diff
+%{__patch} -d .. -p1 < diffs/func.inc.diff
+%{__patch} -d .. -p1 < diffs/index.php.diff
+%{__patch} -d .. -p1 < diffs/labels.inc.diff
+%{__patch} -d .. -p1 < diffs/main.inc.diff
+%{__patch} -d .. -p1 < diffs/main.inc.php.diff
+%{__patch} -d .. -p1 < diffs/messages.inc.diff
+%{__patch} -d .. -p1 < diffs/rcube_user.php.diff
+%{__patch} -d .. -p1 < diffs/settingstabs.html.diff
 %endif
 
 %install
@@ -268,10 +237,10 @@
 ln -sf %{_sysconfdir}/db.inc.php $RPM_BUILD_ROOT%{_appdir}/config/db.inc.php
 ln -sf %{_sysconfdir}/main.inc.php $RPM_BUILD_ROOT%{_appdir}/config/main.inc.php
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 # find locales
 %find_lang %{name}.lang
@@ -418,6 +387,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2012/04/20 17:12:14  glen
+- use plain tarball without extra deps; instead of removing downloading and removing them again
+
 Revision 1.127  2012/04/20 16:58:09  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/roundcubemail/roundcubemail.spec?r1=1.127&r2=1.128

