packages: openafs/openafs.spec - fix mismerge in changelog
sparky
sparky at pld-linux.org
Sun Dec 13 21:43:46 CET 2009
Author: sparky Date: Sun Dec 13 20:43:46 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix mismerge in changelog
---- Files affected:
packages/openafs:
openafs.spec (1.42 -> 1.43)
---- Diffs:
================================================================
Index: packages/openafs/openafs.spec
diff -u packages/openafs/openafs.spec:1.42 packages/openafs/openafs.spec:1.43
--- packages/openafs/openafs.spec:1.42 Tue Oct 27 12:34:20 2009
+++ packages/openafs/openafs.spec Sun Dec 13 21:43:41 2009
@@ -415,6 +415,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.43 2009/12/13 20:43:41 sparky
+- fix mismerge in changelog
+
Revision 1.42 2009/10/27 11:34:20 lisu
- up to 1.5.66
- handle situation when autoconf is not in 2.61 version (aclocal.patch)
@@ -430,14 +433,10 @@
Revision 1.40 2008/12/26 02:53:14 adamg
- reverted previous commit (mistake)
-<<<<<<< openafs.spec
-Revision 1.38 2008-01-11 16:02:51 wolvverine
-=======
Revision 1.39 2008/12/26 01:52:47 adamg
- updated to 1.3.2
Revision 1.38 2008-01-11 16:02:51 wolvverine
->>>>>>> 1.39
- up to 1.5.30, clean, NFY
Revision 1.37 2007-05-17 21:59:36 arekm
@@ -525,9 +524,9 @@
- fails on install
Revision 1.11 2002/05/21 23:14:18 kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
- s/^automake -a -c -f/\%\{__automake\}/; \
- s/^autoconf/\%\{__autoconf\}/"
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+ s/^automake -a -c -f/\%\{__automake\}/; \
+ s/^autoconf/\%\{__autoconf\}/"
Revision 1.10 2002/02/23 04:05:45 kloczek
- adapterized.
@@ -550,10 +549,10 @@
- adapterized, added pl translations
Revision 1.4 2001/08/23 16:51:50 filon
-- changed: make -> %%{__make}
+- changed: make -> %{__make}
Revision 1.3 2001/07/26 05:42:22 saq
- reverting last change: removing new macros from %p{re,ost}{,un}
Revision 1.1 2000/12/06 09:59:01 misiek
-raw spec
+- raw spec
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openafs/openafs.spec?r1=1.42&r2=1.43&f=u
More information about the pld-cvs-commit
mailing list