From 32595f3280281e7cbcf1a1a4271785e8dcaf62146076ed9de82a05a3a0f0fcb5 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 9 Jan 2008 20:58:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ctags?expand=0&rev=7 --- ctags.changes | 5 +++ ctags.spec | 32 ++++++++------- etags-17.34.tar.gz | 3 -- etags-17.34.diff => etags-17.38.diff | 60 ++++------------------------ etags-17.38.tar.gz | 3 ++ 5 files changed, 33 insertions(+), 70 deletions(-) delete mode 100644 etags-17.34.tar.gz rename etags-17.34.diff => etags-17.38.diff (59%) create mode 100644 etags-17.38.tar.gz diff --git a/ctags.changes b/ctags.changes index fc96050..92a7c61 100644 --- a/ctags.changes +++ b/ctags.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 9 13:59:22 CET 2008 - schwab@suse.de + +- Update etags from Emacs trunk (17.38). + ------------------------------------------------------------------- Tue Nov 13 14:22:21 CET 2007 - schwab@suse.de diff --git a/ctags.spec b/ctags.spec index eaa1ae2..f14acd2 100644 --- a/ctags.spec +++ b/ctags.spec @@ -1,7 +1,7 @@ # -# spec file for package ctags (Version 2007.11.13) +# spec file for package ctags (Version 2008.1.9) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,18 +14,18 @@ Name: ctags License: GPL v2 or later Group: Development/Tools/Navigators AutoReqProv: on -%define exuberant_ver 5.7 -%define emacs_ver 17.34 -Version: 2007.11.13 +%define ctags_ver 5.7 +%define etags_ver 17.38 +Version: 2008.1.9 Release: 1 Summary: A Program to Generate Tag Files for Use with vi and Other Editors Url: http://ctags.sourceforge.net/ -Source0: ftp://ftp.sourceforge.net/pub/sourceforge/c/ct/ctags/ctags-%{exuberant_ver}.tar.bz2 -Source1: etags-%{emacs_ver}.tar.gz +Source0: ftp://ftp.sourceforge.net/pub/sourceforge/c/ct/ctags/ctags-%{ctags_ver}.tar.bz2 +Source1: etags-%{etags_ver}.tar.gz Source2: README.SuSE -Patch0: ctags-%{exuberant_ver}.diff +Patch0: ctags-%{ctags_ver}.diff Patch1: ctags-ycp-parser.diff -Patch2: etags-%{emacs_ver}.diff +Patch2: etags-%{etags_ver}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,10 +46,10 @@ Authors: Francesco Potort́ %prep -%setup -n ctags-%{exuberant_ver} -b 1 +%setup -q -n ctags-%{ctags_ver} -b 1 %patch %patch1 -cd ../etags-%{emacs_ver} +cd ../etags-%{etags_ver} %patch2 %build @@ -58,9 +58,8 @@ CFLAGS="$RPM_OPT_FLAGS -Wall" export CFLAGS CC ./configure --prefix=/usr --mandir=%{_mandir} --disable-etags make -cd ../etags-%{emacs_ver} -CFLAGS="$CFLAGS -I../ctags-%{exuberant_ver}" -CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DHAVE_UNISTD_H -DHAVE_GETCWD" +cd ../etags-%{etags_ver} +CFLAGS="$CFLAGS -DSTDC_HEADERS -DHAVE_UNISTD_H -DHAVE_GETCWD" $CC $CFLAGS -o etags etags.c $CC $CFLAGS -DCTAGS -o gnuctags etags.c @@ -69,7 +68,7 @@ make install prefix=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT%{_mandir} mkdir -p $RPM_BUILD_ROOT%{_docdir}/ctags/Exuberant_Ctags install -m 644 COPYING EXTENDING.html FAQ README $RPM_BUILD_ROOT%{_docdir}/ctags/Exuberant_Ctags install -m 644 %{S:2} $RPM_BUILD_ROOT%{_docdir}/ctags -cd ../etags-%{emacs_ver} +cd ../etags-%{etags_ver} install -m 755 etags gnuctags $RPM_BUILD_ROOT/usr/bin install -m 644 etags.1 $RPM_BUILD_ROOT%{_mandir}/man1 ln -sf etags.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/gnuctags.1.gz @@ -87,7 +86,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/gnuctags.1.gz %{_mandir}/man1/etags.1.gz %{_docdir}/ctags + %changelog +* Wed Jan 09 2008 - schwab@suse.de +- Update etags from Emacs trunk (17.38). * Tue Nov 13 2007 - schwab@suse.de - Update etags from Emacs trunk. * Mon Nov 12 2007 - bwalle@suse.de diff --git a/etags-17.34.tar.gz b/etags-17.34.tar.gz deleted file mode 100644 index 66af641..0000000 --- a/etags-17.34.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:172b24bbe692dcb9f22b2cd1759e4c36932df0132ab2ecab69069933d0bbf2b0 -size 57612 diff --git a/etags-17.34.diff b/etags-17.38.diff similarity index 59% rename from etags-17.34.diff rename to etags-17.38.diff index 988583b..a688f48 100644 --- a/etags-17.34.diff +++ b/etags-17.38.diff @@ -18,7 +18,7 @@ .if n .br [\|\-o \fItagfile\fP\|] [\|\-r \fIregexp\fP\|] [\|\-\-parse\-stdin=\fIfile\fP\|] -@@ -46,7 +46,7 @@ etags, ctags \- generate tag file for Em +@@ -45,7 +45,7 @@ etags, ctags \- generate tag file for Em The \|\fBetags\fP\| program is used to create a tag table file, in a format understood by .BR emacs ( 1 )\c @@ -27,7 +27,7 @@ format understood by .BR vi ( 1 )\c \&. Both forms of the program understand -@@ -56,7 +56,7 @@ Python, Prolog, Scheme and +@@ -55,7 +55,7 @@ Python, Prolog, Scheme and most assembler\-like syntaxes. Both forms read the files specified on the command line, and write a tag table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for @@ -35,8 +35,8 @@ +\fBgnuctags\fP) in the current working directory. Files specified with relative file names will be recorded in the tag table with file names relative to the directory where the tag table - resides. If the tag table is in /dev, however, the file names are made -@@ -71,7 +71,7 @@ parsing of the file names following the + resides. If the tag table is in /dev or is the standard output, +@@ -70,7 +70,7 @@ parsing of the file names following the language, overriding guesses based on filename extensions. .SH OPTIONS Some options make sense only for the \fBvi\fP style tag files produced @@ -45,7 +45,7 @@ \fBetags\fP does not recognize them. The programs accept unambiguous abbreviations for long option names. .TP -@@ -85,7 +85,7 @@ expression search instructions; the \fB\ +@@ -84,7 +84,7 @@ expression search instructions; the \fB\ the delimiter `\|\fB?\fP\|', to search \fIbackwards\fP through files. The default is to use the delimiter `\|\fB/\fP\|', to search \fIforwards\fP through files. @@ -54,36 +54,7 @@ .TP .B \-\-declarations In C and derived languages, create tags for function declarations, -@@ -94,24 +94,24 @@ and create tags for extern variables unl - .B \-d, \-\-defines - Create tag entries for C preprocessor constant definitions - and enum constants, too. Since this is the default behavior of --\fBetags\fP, only \fBctags\fP accepts this option. -+\fBetags\fP, only \fBgnuctags\fP accepts this option. - .TP - .B \-D, \-\-no\-defines - Do not create tag entries for C preprocessor constant definitions - and enum constants. - This may make the tags file much smaller if many header files are tagged. --Since this is the default behavior of \fBctags\fP, only \fBetags\fP -+Since this is the default behavior of \fBgnuctags\fP, only \fBetags\fP - accepts this option. - .TP - .B \-\-globals - Create tag entries for global variables in C, C++, Objective C, Java, - and Perl. --Since this is the default behavior of \fBetags\fP, only \fBctags\fP -+Since this is the default behavior of \fBetags\fP, only \fBgnuctags\fP - accepts this option. - .TP - .B \-\-no\-globals - Do not tag global variables. Typically this reduces the file size by --one fourth. Since this is the default behavior of \fBctags\fP, only -+one fourth. Since this is the default behavior of \fBgnuctags\fP, only - \fBetags\fP accepts this option. - .TP - \fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP -@@ -168,7 +168,7 @@ the previous ones. The regexps are of o +@@ -154,7 +154,7 @@ the previous ones. The regexps are of o where \fItagregexp\fP is used to match the tag. It should not match useless characters. If the match is such that more characters than needed are unavoidably matched by \fItagregexp\fP, it may be useful to @@ -92,22 +63,7 @@ ignores regexps without a \fInameregexp\fP. The syntax of regexps is the same as in emacs. The following character escape sequences are supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which -@@ -243,12 +243,12 @@ freely intermixed with filenames and the - .TP - .B \-t, \-\-typedefs - Record typedefs in C code as tags. Since this is the default behavior --of \fBetags\fP, only \fBctags\fP accepts this option. -+of \fBetags\fP, only \fBgnuctags\fP accepts this option. - .TP - .B \-T, \-\-typedefs\-and\-c++ - Generate tag entries for typedefs, struct, enum, and union tags, and - C++ member functions. Since this is the default behavior --of \fBetags\fP, only \fBctags\fP accepts this option. -+of \fBetags\fP, only \fBgnuctags\fP accepts this option. - .TP - .B \-u, \-\-update - Update tag entries for \fIfiles\fP specified on command line, leaving -@@ -256,15 +256,15 @@ tag entries for other files in place. C +@@ -233,15 +233,15 @@ tag entries for other files in place. C by deleting the existing entries for the given files and then rewriting the new entries at the end of the tags file. It is often faster to simply rebuild the entire tag file than to use this. @@ -126,7 +82,7 @@ .TP .B \-h, \-H, \-\-help Print usage information. Followed by one or more \-\-language=LANG -@@ -278,8 +278,10 @@ emacs \fBetags\fP is shipped with). +@@ -255,8 +255,10 @@ emacs \fBetags\fP is shipped with). `\|\fBemacs\fP\|' entry in \fBinfo\fP; \fIGNU Emacs Manual\fP, Richard Stallman. .br diff --git a/etags-17.38.tar.gz b/etags-17.38.tar.gz new file mode 100644 index 0000000..97a357b --- /dev/null +++ b/etags-17.38.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3babd7f1b351b88fb6464b9bc8e3b8fadfb828ab9ca72f1a29b7c2cd9e1049d +size 57574