up to 6.3.4

- home-etc patch applied upstream (global-home_etc.patch, global-globash-altercfg.patch outdated)
- global-acinclude-fix.patch - outdated

diff --git a/global-acinclude-fix.patch b/global-acinclude-fix.patch
deleted file mode 100644 (file)
index ccd882a..0000000
--- a/global-acinclude-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur global-4.6.1.orig/acinclude.m4 global-4.6.1/acinclude.m4
---- global-4.6.1.orig/acinclude.m4     2003-10-03 12:15:29.000000000 +0200
-+++ global-4.6.1/acinclude.m4  2004-02-20 17:35:21.000000000 +0100
-@@ -18,7 +18,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
--AC_DEFUN(AG_STRUCT_DP_D_NAMLEN,
-+AC_DEFUN([AG_STRUCT_DP_D_NAMLEN],
- [AC_CACHE_CHECK([for dp_d_namlen in struct dirent], ac_cv_struct_dp_d_namlen,
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include <dirent.h>], [struct dirent s; s.d_namlen;],
-@@ -28,7 +28,7 @@
- fi
- ])
- 
--AC_DEFUN(AG_STRUCT_DP_D_TYPE,
-+AC_DEFUN([AG_STRUCT_DP_D_TYPE],
- [AC_CACHE_CHECK([for dp_d_type in struct dirent], ac_cv_struct_dp_d_type,
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include <dirent.h>], [struct dirent s; s.d_type;],
-@@ -39,7 +39,7 @@
- ])
- 
- dnl derived from acspecific.m4 and fix warning.
--AC_DEFUN(AG_BYTE_ORDER,
-+AC_DEFUN([AG_BYTE_ORDER],
- [AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
- [ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
-@@ -70,7 +70,7 @@
- fi
- ])
- 
--AC_DEFUN(AG_DJGPP,
-+AC_DEFUN([AG_DJGPP],
- [AC_CACHE_CHECK([whether we are using the GNU DJGPP compiler], ac_cv_djgpp,
- [AC_TRY_COMPILE([], [#ifdef __DJGPP__
- int a;

diff --git a/global-globash-altercfg.patch b/global-globash-altercfg.patch
deleted file mode 100644 (file)
index c75346b..0000000
--- a/global-globash-altercfg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur global-4.6.orig/globash.rc global-4.6/globash.rc
---- global-4.6.orig/globash.rc 2003-07-02 05:31:16.000000000 +0200
-+++ global-4.6/globash.rc      2004-02-20 02:50:25.000000000 +0100
-@@ -36,7 +36,14 @@
- # Global variables and utilities.
- ###########################################################################
- ### Working directory
--GHOME=$HOME/.globash
-+if [ -n "$GLOBASH_HOME" ]; then
-+      GHOME=$GLOBASH_HOME/.globash
-+else
-+      GHOME=$HOME/.globash
-+fi
-+GHOMECF="$GHOME"rc
-+export GHOME GHOMECF
-+
- if [ ! -d $GHOME ]; then
-       echo
-       echo "GloBash --- Global facility for Bash"
-@@ -75,7 +82,7 @@
- __gtags_clean() {
-       for d in $XREF $STACK $MARKER $TMP1; do
-               case $d in
--              $HOME/.globash/*-$$) rm -f $d;;
-+              $GHOME/*-$$) rm -f $d;;
-               esac
-       done
- }
-@@ -763,8 +770,8 @@
- # Run private command script.
- #
- gtags_aliases=1
--if [ -f $HOME/.globashrc ]; then
--      source $HOME/.globashrc
-+if [ -f $GHOMECF ]; then
-+      source $GHOMECF
- fi
- #
- # Aliases

diff --git a/global-home_etc.patch b/global-home_etc.patch
deleted file mode 100644 (file)
index c76ed56..0000000
--- a/global-home_etc.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Nur global-4.6.orig/gozilla/gozilla.c global-4.6/gozilla/gozilla.c
---- global-4.6.orig/gozilla/gozilla.c  2003-07-02 05:31:15.000000000 +0200
-+++ global-4.6/gozilla/gozilla.c       2004-02-20 13:32:06.000000000 +0100
-@@ -28,6 +28,13 @@
- #include <windows.h>
- #endif
- 
-+#ifdef HAVE_HOME_ETC_H
-+#include <home_etc.h>
-+#define HOMEDIR _HEdir
-+#else
-+#define HOMEDIR getenv("HOME")
-+#endif
-+
- #include "global.h"
- #include "regex.h"
- #include "const.h"
-@@ -102,7 +109,7 @@
-       char *p, *alias = NULL;
-       int flag = STRBUF_NOCRLF;
- 
--      if (!(p = getenv("HOME")))
-+      if (!(p = HOMEDIR))
-               goto end;
-       if (!test("r", makepath(p, gozillarc, NULL)))
- #ifdef __DJGPP__
-diff -Nur global-4.6.orig/libutil/conf.c global-4.6/libutil/conf.c
---- global-4.6.orig/libutil/conf.c     2003-07-02 05:31:15.000000000 +0200
-+++ global-4.6/libutil/conf.c  2004-02-20 13:33:16.000000000 +0100
-@@ -33,6 +33,13 @@
- #include <strings.h>
- #endif
- 
-+#ifdef HAVE_HOME_ETC_H
-+#include <home_etc.h>
-+#define HOMEDIR _HEdir
-+#else
-+#define HOMEDIR getenv("HOME")
-+#endif
-+
- #include "gparam.h"
- #include "conf.h"
- #include "die.h"
-@@ -213,10 +220,10 @@
-       /*
-        * if GTAGSCONF not set then check standard config files.
-        */
--      else if ((p = getenv("HOME")) && test("r", makepath(p, GTAGSRC, NULL)))
-+      else if ((p = HOMEDIR) && test("r", makepath(p, GTAGSRC, NULL)))
-               strlimcpy(config, makepath(p, GTAGSRC, NULL), sizeof(config));
- #ifdef __DJGPP__
--      else if ((p = getenv("HOME")) && test("r", makepath(p, DOS_GTAGSRC, NULL)))
-+      else if ((p = HOMEDIR) && test("r", makepath(p, DOS_GTAGSRC, NULL)))
-               strlimcpy(config, makepath(p, DOS_GTAGSRC, NULL), sizeof(config));
- #endif
-       else if (test("r", GTAGSCONF))
-diff -Nur global-4.6.orig/configure.ac global-4.6/configure.ac
---- global-4.6.orig/configure.ac       2004-02-20 13:52:24.000000000 +0100
-+++ global-4.6/configure.ac    2004-02-20 13:59:32.000000000 +0100
-@@ -132,6 +132,39 @@
-         AC_MSG_RESULT(no)
- ])
-+dnl
-+dnl for home-etc support
-+dnl
-+AC_MSG_CHECKING(for home-etc support)
-+AC_ARG_WITH(home-etc,
-+[  --with-home-etc[=DIR]     include home-etc support ],
-+[
-+        if test "$withval" = 'no'; then
-+                AC_MSG_RESULT(no)
-+        else
-+                case $withval in
-+                ''|yes) HOMEETC=/usr/local;;
-+              shared) HOMEETC=${prefix};;
-+                *)      HOMEETC=$withval;;
-+                esac
-+                if ! test -d $HOMEETC; then
-+                        AC_MSG_ERROR([directory '$HOMEETC' not found.])
-+                fi
-+              if ! test -f $HOMEETC/include/home_etc.h; then
-+                        AC_MSG_ERROR([header '$HOMEETC/include/home_etc.h' not found.])
-+                fi
-+                INCLUDES="$INCLUDES -I$HOMEETC/include"
-+                CFLAGS="$CFLAGS -DHAVE_HOME_ETC_H"
-+              case $withval in
-+              shared) LDADD="$LDADD -lhome_etc -lcrypt";;
-+              *)      LDADD="$LDADD $HOMEETC/lib/libhome_etc.a";;
-+              esac
-+                AC_MSG_RESULT([yes, using $HOMEETC])
-+        fi
-+],[
-+        AC_MSG_RESULT(no)
-+])
-+
- AC_SUBST(INCLUDES)
- AC_SUBST(LDADD)
- 

diff --git a/global.spec b/global.spec
index ae06d62005fee6fb115c8ba54a6785e46d3079ef..99e666afdf6813af786bcafa96c48bc0ba9df40d 100644 (file)
--- a/global.spec
+++ b/global.spec
@@ -1,27 +1,32 @@
-#
+# TODO
+# unpackaged:
+#%attr(755,root,root) %{_bindir}/globash
+#%attr(755,root,root) %{_bindir}/gtags-cscope
+#%{_libdir}/gtags/*.{so,la,a}
+#%{_datadir}/gtags/*
+#%{_mandir}/man1/globash.1*
+
 # Conditional build:
 %bcond_without xemacs          # without xemacs subpackage
 %bcond_without pgsql           # without PostgreSQL support
-%bcond_without home_etc        # don't use home_etc
-#
+%bcond_without home_etc        # use home_etc
+
 Summary:       GNU GLOBAL - common source code tag system
 Summary(pl.UTF-8):     GNU GLOBAL - system list odwołań powszechnego użytku
 Name:          global
-Version:       4.7
-Release:       6
-License:       GPL
+Version:       6.3.4
+Release:       0.1
+License:       GPLv2+ and BSD
 Group:         Development/Tools
-Source0:       ftp://ftp.gnu.org/pub/gnu/global/%{name}-%{version}.tar.gz
-# Source0-md5: 1662792366fa44adec3577b2d7ee33a4
+Source0:       http://ftp.gnu.org/gnu/global/%{name}-%{version}.tar.gz
+# Source0-md5: 06aee2306ac2113e6347043066679eea
 #Source1:      http://www.vim.org/scripts/download_script.php?src_id=2708
-Patch10:       %{name}-acinclude-fix.patch
 Patch20:       %{name}-ac-shared-pgsql.patch
-Patch30:       %{name}-home_etc.patch
-Patch40:       %{name}-globash-altercfg.patch
 URL:           http://www.gnu.org/software/global/
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_home_etc:BuildRequires:        home-etc-devel}
+BuildRequires: libtool
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: texinfo
 %{?with_xemacs:BuildRequires:  xemacs}
@@ -36,6 +41,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # definitions useful for vim-global-tags subpackage
 %define                _vimdatadir     %{_datadir}/vim/vimfiles
 
+%define                filterout_c     -Werror=format-security
+
 %description
 GNU GLOBAL is a source code tag system that works the same way across
 diverse environments. It supports C, C++, Yacc, Java, PHP and
@@ -245,19 +252,17 @@ i odwołań systemu GLOBAL używając polecenia less.
 
 %prep
 %setup -q
-%patch10 -p1
-%patch20 -p1
-%{?with_home_etc:%patch30 -p1}
-%patch40 -p1
+#%patch20 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
        %{?with_pgsql:--with-postgres=shared} \
-       %{?with_home_etc:--with-home-etc=shared}
+       %{?with_home_etc:--with-home-etc=/usr}
 %{__make}
 
 %install
@@ -274,12 +279,12 @@ install -d $RPM_BUILD_ROOT%{_bindir} \
 
 # /etc/shrc.d/*.sh hook for globash
 cat << EOF > $RPM_BUILD_ROOT/etc/shrc.d/globash.sh
-alias globash='%{?with_home_etc:GLOBASH_HOME="\$HOME_ETC" }/bin/bash --rcfile %{_sysconfdir}/gtags/globash.rc'
+alias globash='/bin/bash --rcfile %{_sysconfdir}/gtags/globash.rc'
 EOF
 
 # /etc/shrc.d/*.csh hook for globash
 cat << EOF > $RPM_BUILD_ROOT/etc/shrc.d/globash.csh
-alias globash '%{?with_home_etc:setenv GLOBASH_HOME = "\$HOME_ETC" ; }/bin/bash --rcfile %{_sysconfdir}/gtags/globash.rc'
+alias globash '/bin/bash --rcfile %{_sysconfdir}/gtags/globash.rc'
 EOF
 
 # /etc/profile.d/*sh hooks for less-global-tags