packages: cvsps/cvsps-fixes.patch, cvsps/cvsps.spec - up to 2.2b1: - add ...

[glen]

Author: glen                         Date: Mon Jan 31 07:47:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.2b1:
  - add a new line item in the PatchSet output which indicates which 
    branches fork off from after this PatchSet.  This is actually
    the only way to correctly indicate the branching.  The 'Ancestor
    Branch' thing is actually broken by design, and is now deprecated.
  - sometimes cvs log has a timezone in it (from Ludwig Nussel)
  - better buffer size handling

---- Files affected:
packages/cvsps:
   cvsps-fixes.patch (1.2 -> 1.3) , cvsps.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/cvsps/cvsps-fixes.patch
diff -u packages/cvsps/cvsps-fixes.patch:1.2 packages/cvsps/cvsps-fixes.patch:1.3
--- packages/cvsps/cvsps-fixes.patch:1.2	Mon Jan 31 07:19:33 2011
+++ packages/cvsps/cvsps-fixes.patch	Mon Jan 31 08:47:10 2011
@@ -240,8 +240,8 @@
  .B \-A
  Show ancestor branch when a new branch is found.
  .TP
---- b/cvsps.c
-+++ b/cvsps.c	2011-01-31 08:14:42.846391432 +0200
+--- cvsps-2.2b1/cvsps.c~	2011-01-31 08:19:44.000000000 +0200
++++ cvsps-2.2b1/cvsps.c	2011-01-31 08:53:43.552797755 +0200
 @@ -39,7 +39,8 @@
  
  enum
@@ -263,7 +263,7 @@
  static CvsFileRevision * parse_revision(CvsFile * file, char * rev_str);
  static void assign_pre_revision(PatchSetMember *, CvsFileRevision * rev);
  static void check_print_patch_set(PatchSet *);
-@@ -260,12 +263,13 @@
+@@ -267,12 +267,13 @@
  {
      FILE * cvsfp;
      char buff[BUFSIZ];
@@ -271,7 +271,7 @@
 +    int state = NEED_RCS_FILE;
      CvsFile * file = NULL;
      PatchSetMember * psm = NULL;
-     char datebuff[20];
+     char datebuff[26];
      char authbuff[AUTH_STR_MAX];
 -    char logbuff[LOG_STR_MAX + 1];
 +    int logbufflen = LOG_STR_MAX + 1;
@@ -345,13 +345,14 @@
  	    }
  	    else
  	    {
-@@ -480,24 +506,22 @@
+@@ -509,25 +510,22 @@
  		 */
  		if (have_log || !is_revision_metadata(buff))
  		{
 -		    /* if the log buffer is full, that's it.  
 -		     * 
 -		     * Also, read lines (fgets) always have \n in them
+-		     * (unless truncation happens)
 -		     * which we count on.  So if truncation happens,
 -		     * be careful to put a \n on.
 -		     * 

================================================================
Index: packages/cvsps/cvsps.spec
diff -u packages/cvsps/cvsps.spec:1.12 packages/cvsps/cvsps.spec:1.13
--- packages/cvsps/cvsps.spec:1.12	Mon Jan 31 07:20:29 2011
+++ packages/cvsps/cvsps.spec	Mon Jan 31 08:47:10 2011
@@ -1,13 +1,15 @@
 # $Revision$, $Date$
+%define		subver	b1
+%define		rel		1
 Summary:	Patchsets for CVS
 Summary(pl.UTF-8):	Zestawy łatek dla CVS
 Name:		cvsps
-Version:	2.1
-Release:	5
+Version:	2.2
+Release:	0.%{subver}.%{rel}
 License:	GPL
 Group:		Development/Version Control
-Source0:	http://www.cobite.com/cvsps/%{name}-%{version}.tar.gz
-# Source0-md5:	bde2110ed9f5d14de8f8cb04e9d596fe
+Source0:	http://www.cobite.com/cvsps/%{name}-%{version}%{subver}.tar.gz
+# Source0-md5:	997580e8e283034995b9209076858c68
 # Fixes made by git people, see:
 # http://ydirson.free.fr/en/software/scm/cvsps.html
 Patch0:		%{name}-fixes.patch
@@ -34,7 +36,7 @@
 'atomowo' do repozytorium nie jest rzeczą łatwą.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{subver}
 %patch0 -p1
 
 %build
@@ -45,9 +47,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-
-install cvsps $RPM_BUILD_ROOT%{_bindir}
-install cvsps.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -p cvsps $RPM_BUILD_ROOT%{_bindir}
+cp -a cvsps.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +65,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/01/31 07:47:10  glen
+- up to 2.2b1:
+  - add a new line item in the PatchSet output which indicates which
+    branches fork off from after this PatchSet.  This is actually
+    the only way to correctly indicate the branching.  The 'Ancestor
+    Branch' thing is actually broken by design, and is now deprecated.
+  - sometimes cvs log has a timezone in it (from Ludwig Nussel)
+  - better buffer size handling
+
 Revision 1.12  2011/01/31 06:20:29  glen
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsps/cvsps-fixes.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsps/cvsps.spec?r1=1.12&r2=1.13&f=u