roundcubemail.spec
Jakub Bogusz
qboosh w pld-linux.org
Nie, 17 Sie 2008, 14:43:12 CEST
On Tue, Aug 05, 2008 at 02:34:42PM +0200, Arkadiusz Miskiewicz wrote:
> On Tuesday 05 August 2008, Paweł Muszyński wrote:
> > Maciej Świniarski pisze:
> > > Dnia Tue, 05 Aug 2008 14:00:38 +0200
> > >
> > > Paweł Muszyński <pmuch w zamek.szczecin.pl> napisał(a):
> > >> Załączam spec do roundcubemail.
> > >> Zmiana jest właściwie tylko jedna - numer wersji poprawki rcpfa
> > >> (1.0.3), służącej do integracji roundcube z postfixadminem (przy
> > >> zbudowaniu z --with postfixadmin).
> > >> No i podbiłem release o 1
> > >
> > > podeślij proszę zamiast całego speca wynik polecenia
> > > cvs diff -u roundcubemail.spec
> >
> > Index: roundcubemail.spec
> > ===================================================================
> > RCS file: /cvsroot/SPECS/roundcubemail.spec,v
> > retrieving revision 1.67
> > diff -u -r1.67 roundcubemail.spec
> > --- roundcubemail.spec 4 Aug 2008 14:07:45 -0000 1.67
> > +++ roundcubemail.spec 5 Aug 2008 12:25:06 -0000
> > @@ -15,7 +15,7 @@
> > Summary(pl.UTF-8): RoundCube Webmail - poczta przez WWW
> > Name: roundcubemail
> > Version: 0.2
> > -Release: 0.%{_rc}.2
> > +Release: 0.%{_rc}.3
> > License: GPL v2
> > Group: Applications/WWW
> > Source0:
> > http://dl.sourceforge.net/roundcubemail/%{name}-%{version}-%{_rc}.1.tar.gz
> > @@ -23,7 +23,7 @@
> > Source1: %{name}.config
> > Source2: %{name}.logrotate
> > Source3: %{name}-lighttpd.conf
> > -Source4: http://nejc.skoberne.net/rcpfa/rcpfa-1.0.2.tgz
> > +Source4: http://nejc.skoberne.net/rcpfa/rcpfa-1.0.3.tgz
> > Patch0: %{name}-config.patch
> > Patch1: %{name}-faq-page.patch
> > Patch2: %{name}-tz.patch
> > @@ -118,24 +118,24 @@
> > 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-1.0.2/code/forwarding.html skins/default/templates
> > -cp rcpfa-1.0.2/code/password.html skins/default/templates
> > -cp rcpfa-1.0.2/code/vacation.html skins/default/templates
> > -cp rcpfa-1.0.2/code/pfa_forwarding.inc program/steps/settings
> > -cp rcpfa-1.0.2/code/pfa_password.inc program/steps/settings
> > -cp rcpfa-1.0.2/code/pfa_vacation.inc program/steps/settings
> > -cp rcpfa-1.0.2/code/pfa.php program/include
> > -
> > -patch -p1 < rcpfa-1.0.2/diffs/app.js.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/db.inc.php.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/func.inc.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/index.php.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/labels.inc.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/main.inc.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/main.inc.php.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/messages.inc.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/rcube_user.php.diff
> > -patch -p1 < rcpfa-1.0.2/diffs/settingstabs.html.diff
> > +cp rcpfa-1.0.3/code/forwarding.html skins/default/templates
> > +cp rcpfa-1.0.3/code/password.html skins/default/templates
> > +cp rcpfa-1.0.3/code/vacation.html skins/default/templates
> > +cp rcpfa-1.0.3/code/pfa_forwarding.inc program/steps/settings
> > +cp rcpfa-1.0.3/code/pfa_password.inc program/steps/settings
> > +cp rcpfa-1.0.3/code/pfa_vacation.inc program/steps/settings
> > +cp rcpfa-1.0.3/code/pfa.php program/include
> > +
> > +patch -p1 < rcpfa-1.0.3/diffs/app.js.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/db.inc.php.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/func.inc.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/index.php.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/labels.inc.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/main.inc.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/main.inc.php.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/messages.inc.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/rcube_user.php.diff
> > +patch -p1 < rcpfa-1.0.3/diffs/settingstabs.html.diff
>
> Tu przy każdym musisz dać jeszcze || exit 1 by błąd w nakładaniu łatki wywalał
> cały build
Przecież skrypty są wykonywane przez sh -e, co od razu daje takie
zachowanie.
--
Jakub Bogusz http://qboosh.pl/
Więcej informacji o liście dyskusyjnej pld-devel-pl