update to ctags-5.8

OBS-URL: https://build.opensuse.org/package/show/devel:tools/ctags?expand=0&rev=8
2011-07-29 17:05:42 +00:00 · 2011-07-29 17:05:42 +00:00 · 2de392068a
commit 2de392068a
parent b8236f24bf
6 changed files with 109 additions and 36 deletions
--- a/ctags-5.7.tar.bz2
+++ b/ctags-5.7.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:556d96596297777d9223f71146514be7c912c577906674a5e9a0b2747f331a9f
-size 228950
--- a/ctags-5.8.tar.gz
+++ b/ctags-5.8.tar.gz
--- a/ctags-date-time.patch
+++ b/ctags-date-time.patch
@ -0,0 +1,34 @@
+Index: ctags-5.8/options.c
+===================================================================
+--- ctags-5.8.orig/options.c
+++ ctags-5.8/options.c
+@@ -924,7 +924,6 @@ static void printProgramIdentification (
+ 	printf ("%s %s, %s %s\n",
+ 	        PROGRAM_NAME, PROGRAM_VERSION,
+ 	        PROGRAM_COPYRIGHT, AUTHOR_NAME);
+-	printf ("  Compiled: %s, %s\n", __DATE__, __TIME__);
+ 	printf ("  Addresses: <%s>, %s\n", AUTHOR_EMAIL, PROGRAM_URL);
+ 	printFeatureList ();
+ }
+Index: ctags-5.8/main.c
+===================================================================
+--- ctags-5.8.orig/main.c
+++ ctags-5.8/main.c
+@@ -93,17 +93,6 @@
+ */
+ static struct { long files, lines, bytes; } Totals = { 0, 0, 0 };
+ 
+-#ifdef AMIGA
+-# include "ctags.h"
+-  static const char *VERsion = "$VER: "PROGRAM_NAME" "PROGRAM_VERSION" "
+-# ifdef __SASC
+-  __AMIGADATE__
+-# else
+-  __DATE__
+-# endif
+-  " "AUTHOR_NAME" $";
+-#endif
+-
+ /*
+ *   FUNCTION PROTOTYPES
+ */
--- a/ctags.changes
+++ b/ctags.changes
@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Fri Jul 29 16:49:36 UTC 2011 - puzel@novell.com
+
+- update to ctags-5.8 
+ - Removed ".ml" as a Lisp extension (now OCaml) [Lisp].
+ - Added support for Ant language, contributed by David Fishburn.
+ - Added support for DOS Batch language, contributed by David
+   Fishburn.
+ - Added support for Flex (Adobe) language, contributed by David
+   Fishburn.
+ - Added support for MATLAB language, contributed by David Fishburn.
+ - Added support for Objective Camel (OCaml), provided by Vincent
+   Berthoux
+ - Added support for TeX language, contributed by David Fishburn.
+ - Added support for VHDL language, contributed by Nicolas Vincent
+ - Added support for Pyrex/Cython declarations [Python].
+ - Added support for "v" kind, for variables [Python].
+ - Added support for class and member variables
+ - Added support for recent enhancements to Eiffel language
+   [Eiffel].
+ - Added support for ASP classes, contributed by Zendhi Nagao;
+   changes meaning of 'c' kind flag [ASP].
+ - Added regex support when compiling with MinGW. Gnu regex module
+   now included in all distributions.
+ - Fixed detection of triple strings inside other strings
+ - Fixed an endless loop with comments in triple strings
+ - Fixed bug where functions were sometimes seen as methods
+ - Fixed parsing of method parameter annotations, fix contributed by
+   Paolo "blaisorblade" Giarrusso
+ - Fixed parsing of global scope qualifiers in base class lists
+ - Fixed bug where namespace members were given kinds corresponding
+   to globals 
+ - Fixed parsing of "else"
+ - Fixed parsing of derived enums
+ - Fixed parsing of "foreach"
+ - Fixed parsing of simple generic classes
+ - Fixed bug with detecting identifiers inside variables
+ - Fixed bug with detecting identifiers at the start of variables
+ - Fixed parsing of triple single-quoted multi-line strings
+- disabled YCP parser for now (does not apply)
+- add ctags-date-time.patch
+- use spec-cleaner
+
 -------------------------------------------------------------------
 Fri Dec 18 16:44:25 CET 2009 - jengelh@medozas.de

--- a/ctags.spec
+++ b/ctags.spec
@ -18,21 +18,24 @@


 Name:           ctags
-License:        GPLv2+
-Group:          Development/Tools/Navigators
-AutoReqProv:    on
-%define ctags_ver	5.7
+%define ctags_ver	5.8
 %define etags_ver	17.38.1.4
-Version:        2009.12.21
+# Let the date means last update of either ctags or etags tarball
+Version:        2011.07.29
 Release:        1
+License:        GPLv2+
 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-%{ctags_ver}.tar.bz2
+Group:          Development/Tools/Navigators
+Source0:        ctags-%{ctags_ver}.tar.gz
 Source1:        etags-%{etags_ver}.tar.gz
 Source2:        README.SuSE
-Patch0:         ctags-%{ctags_ver}.diff
-Patch1:         ctags-ycp-parser.diff
-Patch2:         etags-%{etags_ver}.diff
+Patch1:         ctags-5.7.diff
+# No resources to make this patch work with ctags-5.8 (applied to ctags-5.7)
+# Anyone is welcome to make it work again.
+#Patch2:        ctags-ycp-parser.diff
+Patch3:         ctags-date-time.patch
+Patch4:         etags-%{etags_ver}.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@ -44,51 +47,44 @@ ETags (from GNU Emacs sources) generates tag files from source code in
 Pascal, Cobol, Ada, Perl, LaTeX, Scheme, Emacs Lisp/Common Lisp,
 Postscript, Erlang, Python, Prolog, and most assembler-like syntaxes.

-
-
-Authors:
--------
-    Darren Hiebert <darren@hiebert.com>
-    Ken Arnold
-    Francesco Potortì <pot@gnu.org>
-
 %prep
 %setup -q -n ctags-%{ctags_ver} -b 1
-%patch0
 %patch1
+#%#patch2
+%patch3 -p1
 cd ../etags-%{etags_ver}
-%patch2
+%patch4

 %build
 CC=gcc
-CFLAGS="$RPM_OPT_FLAGS -Wall"
+CFLAGS="%{optflags} -Wall"
 export CFLAGS CC
 ./configure --prefix=/usr --mandir=%{_mandir} --disable-etags
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 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

 %install
-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
+make install prefix=%{buildroot}/usr mandir=%{buildroot}%{_mandir}
+mkdir -p %{buildroot}%{_docdir}/ctags/Exuberant_Ctags
+install -m 644 COPYING EXTENDING.html FAQ README %{buildroot}%{_docdir}/ctags/Exuberant_Ctags
+install -m 644 %{SOURCE2} %{buildroot}%{_docdir}/ctags
 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
-install -m 644 ETAGS.README $RPM_BUILD_ROOT%{_docdir}/ctags
+install -m 755 etags gnuctags %{buildroot}%{_prefix}/bin
+install -m 644 etags.1 %{buildroot}%{_mandir}/man1
+ln -sf etags.1.gz %{buildroot}%{_mandir}/man1/gnuctags.1.gz
+install -m 644 ETAGS.README %{buildroot}%{_docdir}/ctags

 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}

 %files
 %defattr(-,root,root)
-/usr/bin/ctags
-/usr/bin/gnuctags
-/usr/bin/etags
+%{_bindir}/ctags
+%{_bindir}/gnuctags
+%{_bindir}/etags
 %{_mandir}/man1/ctags.1.gz
 %{_mandir}/man1/gnuctags.1.gz
 %{_mandir}/man1/etags.1.gz
--- a/0
+++ b/0