Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm
Modified Files:
Tag: ETERM-0_10
ChangeLog Eterm.spec autogen.sh configure.in
Removed Files:
Tag: ETERM-0_10
Eterm-mdk.spec
Log Message:
Wed Mar 3 12:48:40 2004 Michael Jennings (mej)
Merges.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/ChangeLog,v
retrieving revision 1.278.2.24
retrieving revision 1.278.2.25
diff -u -3 -r1.278.2.24 -r1.278.2.25
--- ChangeLog 19 Jan 2004 19:49:20 -0000 1.278.2.24
+++ ChangeLog 3 Mar 2004 17:42:41 -0000 1.278.2.25
@@ -5181,3 +5181,29 @@
It's too bad you can't just say, "Copyright 1997-2999."
----------------------------------------------------------------------
+Mon Jan 19 21:02:30 2004 Michael Jennings (mej)
+
+Patch from David Lloyd <[EMAIL PROTECTED]> for overstrike support.
+----------------------------------------------------------------------
+Wed Feb 11 14:06:20 2004 Michael Jennings (mej)
+
+Fixed handling of escape sequences while printing. Pointed out by
+Tom A. Cox <[EMAIL PROTECTED]>.
+----------------------------------------------------------------------
+Sun Feb 29 17:51:48 2004 Michael Jennings (mej)
+
+Disable use of ~/user.cfg as requested by Laurence J. Lane
+<[EMAIL PROTECTED]>.
+----------------------------------------------------------------------
+Mon Mar 1 16:53:34 2004 Michael Jennings (mej)
+
+Merging in new backgrounds.
+----------------------------------------------------------------------
+Tue Mar 2 10:56:20 2004 Michael Jennings (mej)
+
+New SRPM.
+----------------------------------------------------------------------
+Wed Mar 3 12:48:40 2004 Michael Jennings (mej)
+
+Merges.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/Eterm.spec,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -3 -r1.3.2.5 -r1.3.2.6
--- Eterm.spec 10 Dec 2003 03:38:11 -0000 1.3.2.5
+++ Eterm.spec 3 Mar 2004 17:42:43 -0000 1.3.2.6
@@ -1,10 +1,9 @@
%define bzip 0
-%define strip 0
Summary: Enlightened terminal emulator
Name: Eterm
Version: 0.10
-Release: 0.3
+Release: 0.4
Copyright: BSD
Group: User Interface/X
Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png
@@ -38,15 +37,15 @@
# macros I use for compatibility with older versions of the macro
%configure --bindir=%{_bindir} --libdir=%{_libdir} --mandir=%{_mandir} \
--datadir=%{_datadir} --sysconfdir=%{_sysconfdir} \
- --enable-multi-charset --enable-escreen --enable-auto-encoding
-make
+ --enable-multi-charset --enable-escreen --enable-auto-encoding %{?acflags}
+%{__make} %{?mflags}
%install
rm -rf $RPM_BUILD_ROOT
# If the configure macro is used above (which it is), there
# is NO reason to use the makeinstall macro here, so don't.
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
( cd $RPM_BUILD_ROOT
mv .%{_bindir}/%{name} .%{_bindir}/%{name}-%{version}
@@ -56,10 +55,6 @@
chmod +x .%{_libdir}/lib*so* ||:
)
-%if %{strip}
-strip -s $RPM_BUILD_ROOT%{_bindir}/* || :
-%endif
-
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
cat > $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/Eterm.desktop <<EOF
[Desktop Entry]
@@ -87,7 +82,7 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-, root, root)
%doc doc/Eterm_reference.html doc/Eterm.1.html doc/Eterm.tcap doc/Eterm.ti
doc/README.Escreen
%doc README ReleaseNotes ReleaseNotes.1 ChangeLog
%config %{_sysconfdir}/X11/applnk/Utilities/Eterm.desktop
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/autogen.sh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -3 -r1.5 -r1.5.2.1
--- autogen.sh 30 Jan 2002 16:59:08 -0000 1.5
+++ autogen.sh 3 Mar 2004 17:42:43 -0000 1.5.2.1
@@ -1,12 +1,12 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-# $Id: autogen.sh,v 1.5 2002/01/30 16:59:08 gilbertt Exp $
+# $Id: autogen.sh,v 1.5.2.1 2004/03/03 17:42:43 mej Exp $
DIE=0
echo "Generating configuration files for Eterm, please wait...."
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(autoconf-2.13 --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile Eterm."
echo "Download the appropriate package for your distribution,"
@@ -22,7 +22,7 @@
DIE=1
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to compile Eterm."
echo "Download the appropriate package for your distribution,"
@@ -37,13 +37,13 @@
echo " libtoolize -c -f"
libtoolize -c -f
echo " aclocal -I . $ACLOCAL_FLAGS"
-aclocal -I . $ACLOCAL_FLAGS
+aclocal-1.4 -I . $ACLOCAL_FLAGS
echo " autoconf"
-autoconf
+autoconf-2.13
echo " autoheader"
-autoheader
+autoheader-2.13
echo " automake -a -c"
-automake -a -c
+automake-1.4 -a -c
./configure "$@"
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/configure.in,v
retrieving revision 1.62.2.11
retrieving revision 1.62.2.12
diff -u -3 -r1.62.2.11 -r1.62.2.12
--- configure.in 19 Jan 2004 19:49:21 -0000 1.62.2.11
+++ configure.in 3 Mar 2004 17:42:43 -0000 1.62.2.12
@@ -1,4 +1,4 @@
-dnl# $Id: configure.in,v 1.62.2.11 2004/01/19 19:49:21 mej Exp $
+dnl# $Id: configure.in,v 1.62.2.12 2004/03/03 17:42:43 mej Exp $
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
export PATH
@@ -108,7 +108,7 @@
AC_PROG_INSTALL
-ASFLAGS="$ASFLAGS -I../"
+ASFLAGS="$CPPFLAGS $CFLAGS $ASFLAGS -I../"
AS=$CC
AC_SUBST(ASFLAGS)
AC_SUBST(AS)
@@ -656,7 +656,7 @@
else
MULTI_CHARSET_TYPE="$enableval"
fi], [
- if (xlsfonts | grep 10646 >&5 2>&5); then
+ if (xlsfonts 2>/dev/null | grep 10646 >&5 2>&5); then
MULTI_CHARSET_TYPE="unicode"
else
MULTI_CHARSET_TYPE=""
@@ -791,9 +791,9 @@
AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE), AC_DEFINE(NO_XLOCALE))
# For multibyte selection handling
-if test "$MULTICHAR_ENCODING" != "none"; then
+#if test "$MULTICHAR_ENCODING" != "none"; then
AC_CHECK_LIB(Xmu, XmuInternAtom)
-fi
+#fi
# check X11R6 for XIM
if test "$XIM" = "TRUE"; then
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
