packages: couchdb/couchdb.spec, apache-couchdb/apache-couchdb.spec - merge ...

[glen]

Author: glen                         Date: Sun Feb 26 10:59:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge todo

---- Files affected:
packages/couchdb:
   couchdb.spec (1.3 -> 1.4) 
packages/apache-couchdb:
   apache-couchdb.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/couchdb/couchdb.spec
diff -u packages/couchdb/couchdb.spec:1.3 packages/couchdb/couchdb.spec:1.4
--- packages/couchdb/couchdb.spec:1.3	Mon May 30 00:31:40 2011
+++ packages/couchdb/couchdb.spec	Sun Feb 26 11:59:17 2012
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 #
-# TODO: init script, sysconfig
+# TODO:
+# - init script, sysconfig
+# - merge apache-couchdb/apache-couchdb.spec here
 #
 Summary:	A distributed document-oriented database
 Summary(pl.UTF-8):	Rozproszona baza danych oparta o dokumenty
@@ -109,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2012/02/26 10:59:17  glen
+- merge todo
+
 Revision 1.3  2011/05/29 22:31:40  zbyniu
 - up to 1.0.1, BRs, cleanups
 

================================================================
Index: packages/apache-couchdb/apache-couchdb.spec
diff -u packages/apache-couchdb/apache-couchdb.spec:1.7 packages/apache-couchdb/apache-couchdb.spec:1.8
--- packages/apache-couchdb/apache-couchdb.spec:1.7	Wed May 18 07:16:08 2011
+++ packages/apache-couchdb/apache-couchdb.spec	Sun Feb 26 11:59:17 2012
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - merge to couchdb/couchdb.spec
 
 %define _mochiwebver r113
 %define _ibrowsever 2.1.2
@@ -173,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/02/26 10:59:17  glen
+- merge todo
+
 Revision 1.7  2011/05/18 05:16:08  aredridel
 - 1.0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/couchdb/couchdb.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-couchdb/apache-couchdb.spec?r1=1.7&r2=1.8&f=u