PLD-doc: devel-hints-en.txt, devel-hints-pl.txt - notes about patching and ...

[pawelz]

Author: pawelz                       Date: Mon Feb  8 07:57:04 2010 GMT
Module: PLD-doc                       Tag: HEAD
---- Log message:
- notes about patching and undosing sources before patching.

---- Files affected:
PLD-doc:
   devel-hints-en.txt (1.37 -> 1.38) , devel-hints-pl.txt (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: PLD-doc/devel-hints-en.txt
diff -u PLD-doc/devel-hints-en.txt:1.37 PLD-doc/devel-hints-en.txt:1.38
--- PLD-doc/devel-hints-en.txt:1.37	Wed Jan 27 01:46:54 2010
+++ PLD-doc/devel-hints-en.txt	Mon Feb  8 08:56:59 2010
@@ -277,6 +277,27 @@
 ignores BuildRequires. For example this should be in %build:
 cp -f /usr/share/automake/config.sub .
 
+All patches should be applied in %prep section using %prepN macros. For
+example:
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p0
+
+CVS, at least PLD CVS, converts DOS ends of line (\r\n) to unix eols (\n). It
+may break some patches. If your patch does not apply after CVS commit /
+checkout, try to undos sources before patching using %undos macro. For
+example:
+
+%undos build.xml
+
+or
+
+%undos $(find -name '*.php')
+
+Don't forget to add %undos BRs. See BuildRequires.txt for details.
+
 Build process section (%build):
 This section should contain everything that's necessary to build a
 package in the %{_topdir}/BUILD directory in the RPM build tree. In this

================================================================
Index: PLD-doc/devel-hints-pl.txt
diff -u PLD-doc/devel-hints-pl.txt:1.57 PLD-doc/devel-hints-pl.txt:1.58
--- PLD-doc/devel-hints-pl.txt:1.57	Wed Jan 27 01:46:54 2010
+++ PLD-doc/devel-hints-pl.txt	Mon Feb  8 08:56:59 2010
@@ -273,6 +273,29 @@
 Powy¿sze tworzy katalog budowania i kopiuje do niego pliki wskazane przez
 Source0 i Source1.
 
+W sekcji %prep nak³adamy ³atki na ¼ród³a korzystaj±c z makr %patchN. Na
+przyk³ad tak:
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p0
+
+CVS, przynajmniej nasz, automatycznie konwertuje koñce linii DOS-owe (\r\n)
+na uniksowe (\n). W przypadku ³atek taka zmiana czêsto powoduje, ¿e po
+scommitowaniu ³atki a nastêpnie pobraniu, ³atka przestaje siê nak³adaæ. Nale¿y
+w takim przypadku przekonwertowaæ koñce linii w patchowanych plikach, na
+przyk³ad tak:
+
+%undos build.xml
+
+albo
+
+%undos $(find -name '*.php')
+
+Pamiêtaj, ¿eby dodaæ odpowiednie BR-y dla makra %undos takie, jak opisano w
+pliku BuildRequires.txt.
+
 Sekcja budowania (%build):
 W tej sekcji nale¿y zawrzeæ wszystko co spowoduje zbudowanie pakietu w
 katalogu %{_topdir}/BUILD w drzewie budowania rpma. W sekcji tej katalog
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/PLD-doc/devel-hints-en.txt?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/PLD-doc/devel-hints-pl.txt?r1=1.57&r2=1.58&f=u