packages: rcs/rcs-debian.patch, rcs/rcs.spec, rcs/rcs-DESTDIR.patch (REMOVE...
qboosh
qboosh at pld-linux.org
Sun Sep 11 21:08:40 CEST 2011
Author: qboosh Date: Sun Sep 11 19:08:40 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.8 (GPL v3+ now)
- removed obsolete stupidrcs,DESTDIR,security patches
- only few hunks left from debian patch
---- Files affected:
packages/rcs:
rcs-debian.patch (1.1 -> 1.2) , rcs.spec (1.37 -> 1.38) , rcs-DESTDIR.patch (1.1 -> NONE) (REMOVED), rcs-security.patch (1.2 -> NONE) (REMOVED), rcs-stupidrcs.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/rcs/rcs-debian.patch
diff -u packages/rcs/rcs-debian.patch:1.1 packages/rcs/rcs-debian.patch:1.2
--- packages/rcs/rcs-debian.patch:1.1 Tue Nov 6 11:10:34 2007
+++ packages/rcs/rcs-debian.patch Sun Sep 11 21:08:35 2011
@@ -1,25 +1,6 @@
---- rcs-5.7.orig/configure.in
-+++ rcs-5.7/configure.in
-@@ -243,7 +243,7 @@
- AC_PATH_PROG(ED, ed, ed)
-
- ac_save_path=$PATH
--PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
-+PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/lib:$PATH
- AC_PATH_PROGS(SENDMAIL, sendmail mail mailx)
- PATH=$ac_save_path
- case $SENDMAIL in
---- rcs-5.7.orig/man/rcsfile.5in
-+++ rcs-5.7/man/rcsfile.5in
-@@ -68,6 +68,7 @@
- \f3state\fP {\f2id\fP}\f3;\fP
- \f3branches\fP {\f2num\fP}*\f3;\fP
- \f3next\fP {\f2num\fP}\f3;\fP
-+ { \f3commitid\fP \f2id\fP\f3;\fP }
- { \f2newphrase\fP }*
- .LP
- \f2desc\fP ::= \f3desc\fP \f2string\fP
-@@ -127,6 +128,18 @@
+--- rcs-5.8/man/rcsfile.5in.orig 2011-01-09 17:00:46.000000000 +0100
++++ rcs-5.8/man/rcsfile.5in 2011-09-11 20:56:42.648245946 +0200
+@@ -119,6 +119,18 @@
Dates use the Gregorian calendar; times use UTC.
.PP
The
@@ -35,196 +16,16 @@
+commitids in this file.
+.PP
+The
- .I newphrase
- productions in the grammar are reserved for future extensions
- to the format of \*r files.
---- rcs-5.7.orig/man/rlog.1
-+++ rcs-5.7/man/rlog.1
-@@ -187,6 +187,10 @@
- .I logins
- is omitted, the user's login is assumed.
- .TP
-+.B \-q
-+This option has no effect;
-+it is provided for consistency with other commands.
-+.TP
- .B \-T
- This option has no effect;
- it is present for compatibility with other \*r commands.
---- rcs-5.7.orig/src/ident.c
-+++ rcs-5.7/src/ident.c
-@@ -234,7 +234,7 @@
- if (c == EOF && feof(fp) | ferror(fp))
- return c;
- switch (ctab[c]) {
-- case LETTER: case Letter:
-+ case LETTER: case Letter: case DIGIT:
- *tp++ = c;
- if (tp < line+sizeof(line)-4)
- break;
---- rcs-5.7.orig/src/rcs.c
-+++ rcs-5.7/src/rcs.c
-@@ -916,10 +916,11 @@
- getkeystring(Klog);
- if (nextdelta == cuttail) {
- cb = savestring(&curlogbuf);
-- if (!delta->log.string)
-+ if (delta && !delta->log.string)
- delta->log = cleanlogmsg(curlogbuf.string, cb.size);
- nextlex();
-- delta->igtext = getphrases(Ktext);
-+ if (delta)
-+ delta->igtext = getphrases(Ktext);
- } else {
- if (nextdelta->log.string && nextdelta->selector) {
- foutptr = 0;
---- rcs-5.7.orig/src/rcsbase.h
-+++ rcs-5.7/src/rcsbase.h
-@@ -358,6 +358,7 @@
- char const * lockedby; /* who locks the revision */
- char const * state; /* state of revision (Exp by default) */
- char const * name; /* name (if any) by which retrieved */
-+ char const * commitid; /* text string to associate commits */
- struct cbuf log; /* log message requested at checkin */
- struct branchhead * branches; /* list of first revisions on branches*/
- struct cbuf ig; /* ignored phrases in admin part */
-@@ -662,6 +663,7 @@
- extern char const *const expand_names[];
- extern char const
- Kaccess[], Kauthor[], Kbranch[], Kcomment[],
-+ Kcommitid[],
- Kdate[], Kdesc[], Kexpand[], Khead[], Klocks[], Klog[],
- Knext[], Kstate[], Kstrict[], Ksymbols[], Ktext[];
- void unexpected_EOF P((void)) exiting;
---- rcs-5.7.orig/src/rcsdiff.c
-+++ rcs-5.7/src/rcsdiff.c
-@@ -212,9 +212,13 @@
- }
- goto option_handled;
- case '-': case 'D':
-- no_diff_means_no_output = false;
-+ if (c == 'D'
-+ || strcmp(*argv, "--side-by-side") == 0
-+ || strcmp(*argv, "--ifdef") == 0) {
-+ no_diff_means_no_output = false;
-+ }
- /* fall into */
-- case 'C': case 'F': case 'I': case 'L': case 'W':
-+ case 'C': case 'F': case 'I': case 'L': case 'U': case 'W':
- #if DIFF_L
- if (c == 'L' && ++file_labels == 2)
- faterror("too many -L options");
---- rcs-5.7.orig/src/rcsedit.c
-+++ rcs-5.7/src/rcsedit.c
-@@ -1503,6 +1503,9 @@
- register size_t dl;
- register struct buf *bn;
- register char const *name = isworkfile ? workname : RCSname;
-+# if has_mktemp
-+ int fd;
-+# endif
-
- dl = basefilename(name) - name;
- bn = &dirtpname[newRCSdirtp_index + isworkfile];
-@@ -1521,10 +1524,12 @@
- catchints();
- # if has_mktemp
- VOID strcpy(tp, "XXXXXX");
-- if (!mktemp(np) || !*np)
-+ fd = mkstemp(np);
-+ if (fd < 0 || !*np)
- faterror("can't make temporary pathname `%.*s_%cXXXXXX'",
- (int)dl, name, '0'+isworkfile
- );
-+ close(fd);
- # else
- /*
- * Posix 1003.1-1990 has no reliable way
---- rcs-5.7.orig/src/rcsfnms.c
-+++ rcs-5.7/src/rcsfnms.c
-@@ -285,6 +285,9 @@
- {
- char *p;
- char const *t = tpnames[n];
-+# if has_mktemp
-+ int fd;
-+# endif
-
- if (t)
- return t;
-@@ -296,10 +299,12 @@
- size_t tplen = dir_useful_len(tp);
- p = testalloc(tplen + 10);
- VOID sprintf(p, "%.*s%cT%cXXXXXX", (int)tplen, tp, SLASH, '0'+n);
-- if (!mktemp(p) || !*p)
-+ fd = mkstemp(p);
-+ if (fd < 0 || !*p)
- faterror("can't make temporary pathname `%.*s%cT%cXXXXXX'",
- (int)tplen, tp, SLASH, '0'+n
- );
-+ close(fd);
- # else
- static char tpnamebuf[TEMPNAMES][L_tmpnam];
- p = tpnamebuf[n];
---- rcs-5.7.orig/src/rcsfreeze.sh
-+++ rcs-5.7/src/rcsfreeze.sh
-@@ -59,8 +59,7 @@
-
- # Stamp the logfile. Because we order the logfile the most recent
- # first we will have to save everything right now in a temporary file.
--TMPLOG=/tmp/rcsfrz$$
--trap 'rm -f $TMPLOG; exit 1' 1 2 13 15
-+TMPLOG=$(tempfile)
- # Now ask for a log message, continously add to the log file
- (
- echo "Version: $SYMREVNAME($SYMREV), Date: $DATE
---- rcs-5.7.orig/src/rcsgen.c
-+++ rcs-5.7/src/rcsgen.c
-@@ -547,6 +547,9 @@
-
- aprintf(fout, ";\n%s\t%s;\n", Knext, node->next?node->next->num:"");
- awrite(node->ig.string, node->ig.size, fout);
-+
-+ if (node->commitid)
-+ aprintf(fout, "%s\t%s;\n", Kcommitid, node->commitid);
- }
-
-
---- rcs-5.7.orig/src/rcssyn.c
-+++ rcs-5.7/src/rcssyn.c
-@@ -171,6 +171,7 @@
- Kauthor[] = "author",
- Kbranch[] = "branch",
- Kcomment[] = "comment",
-+ Kcommitid[] = "commitid",
- Kdate[] = "date",
- Kdesc[] = "desc",
- Kexpand[] = "expand",
-@@ -433,6 +434,14 @@
- Delta->lockedby = 0;
- Delta->log.string = 0;
- Delta->selector = true;
-+
-+ if (getkeyopt(Kcommitid)) {
-+ Delta->commitid = NextString;
-+ nextlex();
-+ getsemi(Kcommitid);
-+ } else
-+ Delta->commitid = NULL;
-+
- Delta->ig = getphrases(Kdesc);
- TotalDeltas++;
- return (true);
---- rcs-5.7.orig/src/rlog.c
-+++ rcs-5.7/src/rlog.c
-@@ -591,6 +591,10 @@
- aprintf(out, insDelFormat,
- editscript->insertlns, editscript->deletelns);
-
-+ if ( node->commitid )
-+ aprintf(out, "%s commitid: %s", (editscript) ? ";" : "",
-+ node->commitid);
-+
- newbranch = node->branches;
- if ( newbranch ) {
- bufautobegin(&branchnum);
+ .I delta
+ nodes form a tree. All nodes whose numbers
+ consist of a single pair
+--- rcs-5.8/src/ident.c.orig 2011-01-07 13:27:18.000000000 +0100
++++ rcs-5.8/src/ident.c 2011-09-11 20:55:08.061576114 +0200
+@@ -51,6 +51,7 @@
+ {
+ case LETTER:
+ case Letter:
++ case DIGIT:
+ *tp++ = c;
+ if (tp < line + sizeof (line) - 4)
+ break;
================================================================
Index: packages/rcs/rcs.spec
diff -u packages/rcs/rcs.spec:1.37 packages/rcs/rcs.spec:1.38
--- packages/rcs/rcs.spec:1.37 Sun May 16 15:12:13 2010
+++ packages/rcs/rcs.spec Sun Sep 11 21:08:35 2011
@@ -7,20 +7,16 @@
Summary(pt_BR.UTF-8): RCS - sistema de controle de versões
Summary(tr.UTF-8): Sürüm denetleme sistemi
Name: rcs
-Version: 5.7
-Release: 22
-License: GPL v2+
+Version: 5.8
+Release: 1
+License: GPL v3+
Group: Development/Version Control
Source0: http://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.gz
-# Source0-md5: 4c8e896f2d2446fa593c6f1601a4fb75
+# Source0-md5: c0fa1f3528418cee83b7e6e06fc87957
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: ba094b833436afc14ac1679a78e50da5
-Patch0: %{name}-stupidrcs.patch
-Patch1: %{name}-DESTDIR.patch
-Patch2: %{name}-security.patch
-Patch3: %{name}-debian.patch
+Patch0: %{name}-debian.patch
URL: http://www.cs.purdue.edu/homes/trinkle/RCS/
-BuildRequires: autoconf
BuildRequires: groff
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,17 +71,13 @@
kodları, belgeler ve makaleler için son derece yararlı bir araçtır.
%prep
-%setup -q
+%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
-%{__autoconf}
%configure \
- --with-diffutils
-touch src/conf.h
+ --with-mailer=/usr/lib/sendmail
+
%{__make}
%install
@@ -95,14 +87,14 @@
DESTDIR=$RPM_BUILD_ROOT
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/rcsfreeze.1*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/rcsfreeze.1*
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CREDITS ChangeLog NEWS README REFS
+%doc AUTHORS ChangeLog NEWS README THANKS
%attr(755,root,root) %{_bindir}/ci
%attr(755,root,root) %{_bindir}/co
%attr(755,root,root) %{_bindir}/ident
@@ -133,6 +125,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2011/09/11 19:08:35 qboosh
+- updated to 5.8 (GPL v3+ now)
+- removed obsolete stupidrcs,DESTDIR,security patches
+- only few hunks left from debian patch
+
Revision 1.37 2010/05/16 13:12:13 sparky
- BR: groff
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rcs/rcs-debian.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rcs/rcs.spec?r1=1.37&r2=1.38&f=u
More information about the pld-cvs-commit
mailing list