From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <p_solntsev_devel@meta.ua>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham
	version=3.2.5
Message-ID: <4A30CD59.9010702@meta.ua>
Date: Thu, 11 Jun 2009 12:24:41 +0300
From: Pavel Solntsev <p_solntsev_devel@meta.ua>
User-Agent: Thunderbird 2.0.0.21 (X11/20090430)
MIME-Version: 1.0
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
X-Enigmail-Version: 0.95.6
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Gen: f1314a35591fc39460ac58e64842e278
Subject: [devel] git Howto
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 09:24:58 -0000
Archived-At: <http://lore.altlinux.org/devel/4A30CD59.9010702@meta.ua/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

Изучаю git.

Задача:
научится создавать рабочие патчи.

имеем:
branch 5.0

$ mkdir molden && cd molden
$ git init-db
$ cp ....../molden-4.7.tar.gz .
$ tar zxvf molden-4.7.tar.gz
$ mv molden-4.7 moden
$ cp ....../molden.spec .
$ mkdir .gear
$ echo "tar.gz: moden" > .gear/rules
$ git add .
$ git commit -a -m "First build for git. Small bug fix"
$ vim molden/xwin.c (правим: заменяем linkat на linkat_new)
$ rm -f molden/xwin.c~
$ git commit -a -m "Edit xwin.c file"
$ git diff > olden-glibc-2.10.patch # git diff -p тоже использовался
$ git add olden-glibc-2.10.patch
$ echo "copy: *.patch" >> .gear/rules
$ gear --rpmbuild -- rpm -ba
Выполняется(%prep): /bin/sh -e /home/group/RPM/tmp/rpm-tmp.46848
+ umask 022
+ /bin/mkdir -p /home/group/RPM/BUILD
+ cd /home/group/RPM/BUILD
+ cd /home/group/RPM/BUILD
+ rm -rf molden-4.7
+ echo 'Source #0 (molden-4.7.tar.gz):'
Source #0 (molden-4.7.tar.gz):
+ /bin/gzip -dc /home/group/tmp/gear.673MXzhj/out/molden-4.7.tar.gz
+ /bin/tar -xf -
+ cd molden-4.7
+ /bin/chmod -c -Rf u+rwX,go-w .
+ echo 'Patch #0 (molden-glibc-2.10.patch):'
Patch #0 (molden-glibc-2.10.patch):
+ /usr/bin/patch -p1
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/molden/xwin.c b/molden/xwin.c
|index 9333498..706c109 100644
|--- a/molden/xwin.c
|+++ b/molden/xwin.c
--------------------------
File to patch:

И все.

в спеке

...
Patch0:         %name-glibc-2.10.patch
...
%patch -p1
...