/[smeserver]/rpms/aspell/sme7/aspell-0.60.3-fileconflict.patch
ViewVC logotype

Annotation of /rpms/aspell/sme7/aspell-0.60.3-fileconflict.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Jun 12 14:41:55 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: aspell-0_60_3-7_1_el4_sme, HEAD
Import on branch sme7 of package aspell-0.60.3-7.1.el4.sme.src.rpm

1 slords 1.1 --- aspell-0.60.3/configure.pom 2006-02-21 11:38:50.668963136 +0100
2     +++ aspell-0.60.3/configure 2006-02-21 11:38:50.717955688 +0100
3     @@ -463,7 +463,7 @@
4     # include <unistd.h>
5     #endif"
6    
7     -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT pkgdocdir pkgdatadir pkglibdir CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED PERLPROG COMPILE_IN_FILTERS_TRUE COMPILE_IN_FILTERS_FALSE PSPELL_COMPATIBILITY_TRUE PSPELL_COMPATIBILITY_FALSE INCREMENTED_SONAME_TRUE INCREMENTED_SONAME_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PTHREAD_LIB CURSES_LIB CURSES_INCLUDE LIBOBJS LTLIBOBJS'
8     +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT pkgdocdir pkgdatadir pkgdatadir2 pkglibdir CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED PERLPROG COMPILE_IN_FILTERS_TRUE COMPILE_IN_FILTERS_FALSE PSPELL_COMPATIBILITY_TRUE PSPELL_COMPATIBILITY_FALSE INCREMENTED_SONAME_TRUE INCREMENTED_SONAME_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PTHREAD_LIB CURSES_LIB CURSES_INCLUDE LIBOBJS LTLIBOBJS'
9     ac_subst_files=''
10    
11     # Initialize some variables set by options.
12     @@ -2106,6 +2106,8 @@
13     pkgdatadir=\${libdir}/aspell-0.60
14     fi
15    
16     +pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
17     +
18    
19    
20    
21     @@ -24361,6 +24363,7 @@
22     s,@MAINT@,$MAINT,;t t
23     s,@pkgdocdir@,$pkgdocdir,;t t
24     s,@pkgdatadir@,$pkgdatadir,;t t
25     +s,@pkgdatadir2@,$pkgdatadir2,;t t
26     s,@pkglibdir@,$pkglibdir,;t t
27     s,@CXX@,$CXX,;t t
28     s,@CXXFLAGS@,$CXXFLAGS,;t t
29     --- aspell-0.60.3/Makefile.in.pom 2005-06-27 11:54:58.000000000 +0200
30     +++ aspell-0.60.3/Makefile.in 2006-02-21 11:42:20.040133880 +0100
31     @@ -318,6 +318,7 @@
32    
33     # These are needed due to a bug in Automake
34     pkgdatadir = @pkgdatadir@
35     +pkgdatadir2 = @pkgdatadir2@
36     pkglibdir = @pkglibdir@
37     ACLOCAL = @ACLOCAL@
38     AMDEP_FALSE = @AMDEP_FALSE@
39     @@ -1875,7 +1876,7 @@
40     cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > dirs.h
41    
42     scripts/run-with-aspell: scripts/run-with-aspell.create
43     - sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
44     + sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
45     chmod 755 scripts/run-with-aspell
46     @PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig
47     @PSPELL_COMPATIBILITY_TRUE@ sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed