From: Jakub Bogusz Date: Fri, 23 Oct 2020 19:34:39 +0000 (+0200) Subject: - updated to 5.10.0 X-Git-Tag: auto/th/rcs-5.10.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=2fb4d281b6eeded5d49eda1b2d081ba48c83caf5;p=packages%2Frcs.git - updated to 5.10.0 - removed obsolete move-exiting-to-beginning-of-func-decl patch --- diff --git a/rcs-move-exiting-to-beginning-of-func-decl.patch b/rcs-move-exiting-to-beginning-of-func-decl.patch deleted file mode 100644 index a2e7344..0000000 --- a/rcs-move-exiting-to-beginning-of-func-decl.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 260704a9164dd34cf7128d6b1e88075ffa3be054 Mon Sep 17 00:00:00 2001 -From: Thien-Thi Nguyen -Date: Thu, 18 Jun 2015 21:25:53 +0200 -Subject: [PATCH] =?UTF-8?q?[C=20slog]=20Move=20=E2=80=98exiting=E2=80=99?= - =?UTF-8?q?=20to=20beginning=20of=20func=20decl.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’ -attribute appearing at the end of the func decl. -Reported by Romain Francoise. -See also . - -* src/b-complain.h (generic_fatal, fatal_syntax, fatal_sys) -* src/b-fb.h (Ierror, Oerror) -* src/base.h (unexpected_EOF, thank_you_and_goodnight): -Move ‘exiting’ attribute to beginning of func decl. ---- - src/ChangeLog | 14 ++++++++++++++ - src/b-complain.h | 10 ++++++---- - src/b-fb.h | 6 ++++-- - src/base.h | 8 ++++---- - 4 files changed, 28 insertions(+), 10 deletions(-) - -diff --git a/src/ChangeLog b/src/ChangeLog -index bb31f05..a2ef6a3 100644 ---- a/src/ChangeLog -+++ b/src/ChangeLog -@@ -1,3 +1,17 @@ -+2015-06-18 Thien-Thi Nguyen -+ -+ [C slog] Move ‘exiting’ to beginning of func decl. -+ -+ Apparently, ‘gcc --std=c11’ does not abide the ‘exiting’ -+ attribute appearing at the end of the func decl. -+ Reported by Romain Francoise. -+ See also . -+ -+ * b-complain.h (generic_fatal, fatal_syntax, fatal_sys) -+ * b-fb.h (Ierror, Oerror) -+ * base.h (unexpected_EOF, thank_you_and_goodnight): -+ Move ‘exiting’ attribute to beginning of func decl. -+ - 2015-01-22 Thien-Thi Nguyen - - Release: 5.9.4 -diff --git a/src/b-complain.h b/src/b-complain.h -index 0ffd157..ea0ffc5 100644 ---- a/src/b-complain.h -+++ b/src/b-complain.h -@@ -32,12 +32,14 @@ extern void generic_warn (char const *who, char const *fmt, ...) - printf_string (2, 3); - extern void generic_error (char const *who, char const *fmt, ...) - printf_string (2, 3); -+exiting - extern void generic_fatal (char const *who, char const *fmt, ...) -- printf_string (2, 3) exiting; -+ printf_string (2, 3); -+exiting - extern void fatal_syntax (size_t lno, char const *fmt, ...) -- printf_string (2, 3) exiting; --extern void fatal_sys (char const *who) -- exiting; -+ printf_string (2, 3); -+exiting -+extern void fatal_sys (char const *who); - - /* Idioms. Here, prefix P stands for "program" (general operation); - M for "manifestation"; R for "repository". */ -diff --git a/src/b-fb.h b/src/b-fb.h -index c9850e7..bf5eaf8 100644 ---- a/src/b-fb.h -+++ b/src/b-fb.h -@@ -21,9 +21,11 @@ - */ - - extern int change_mode (int fd, mode_t mode); --extern void Ierror (void) exiting; -+exiting -+extern void Ierror (void); - extern void testIerror (FILE *f); --extern void Oerror (void) exiting; -+exiting -+extern void Oerror (void); - extern void testOerror (FILE *o); - extern FILE *fopen_safer (char const *filename, char const *type); - extern void Ozclose (FILE **p); -diff --git a/src/base.h b/src/base.h -index 163ee09..5e7a9f8 100644 ---- a/src/base.h -+++ b/src/base.h -@@ -755,8 +755,8 @@ int dorewrite (bool lockflag, int changed); - int donerewrite (int changed, time_t newRCStime); - void ORCSclose (void); - void ORCSerror (void); --void unexpected_EOF (void) -- exiting; -+exiting -+void unexpected_EOF (void); - void initdiffcmd (struct diffcmd *dc); - int getdiffcmd (struct fro *finfile, bool delimiter, - FILE *foutfile, struct diffcmd *dc); -@@ -831,8 +831,8 @@ char const *date2str (char const date[datesize], - char datebuf[datesize + zonelenmax]); - - /* rcsutil */ --void thank_you_and_goodnight (int const how) -- exiting; -+exiting -+void thank_you_and_goodnight (int const how); - /* These are for ‘thank_you_and_goodnight’. */ - #define TYAG_ORCSERROR (1 << 3) - #define TYAG_DIRTMPUNLINK (1 << 2) --- -2.1.0 - diff --git a/rcs.spec b/rcs.spec index c04a3d2..7cff95a 100644 --- a/rcs.spec +++ b/rcs.spec @@ -6,17 +6,16 @@ Summary(pl.UTF-8): RCS - system kontroli wersji 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.9.4 -Release: 2 +Version: 5.10.0 +Release: 1 License: GPL v3+ Group: Development/Version Control -Source0: http://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.xz -# Source0-md5: ab57933fb214384e69664ec1c81775fc +Source0: https://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.xz +# Source0-md5: 7628b198e4b35226d646cd90df89a93e Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: ba094b833436afc14ac1679a78e50da5 Patch0: %{name}-debian.patch Patch1: %{name}-info.patch -Patch2: %{name}-move-exiting-to-beginning-of-func-decl.patch URL: https://www.cs.purdue.edu/homes/trinkle/RCS/ BuildRequires: groff BuildRequires: tar >= 1:1.22 @@ -78,7 +77,6 @@ kodları, belgeler ve makaleler için son derece yararlı bir araçtır. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %configure \