Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm
Modified Files:
ChangeLog Eterm.spec configure.in
Log Message:
Tue Mar 2 10:56:20 2004 Michael Jennings (mej)
New SRPM.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/ChangeLog,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -3 -r1.377 -r1.378
--- ChangeLog 1 Mar 2004 21:47:26 -0000 1.377
+++ ChangeLog 2 Mar 2004 15:49:59 -0000 1.378
@@ -5182,3 +5182,7 @@
Merging in new backgrounds.
----------------------------------------------------------------------
+Tue Mar 2 10:56:20 2004 Michael Jennings (mej)
+
+New SRPM.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/Eterm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Eterm.spec 10 Dec 2003 03:27:02 -0000 1.10
+++ Eterm.spec 2 Mar 2004 15:49:59 -0000 1.11
@@ -1,10 +1,9 @@
%define bzip 0
-%define strip 0
Summary: Enlightened terminal emulator
Name: Eterm
-Version: 0.9.2
-Release: 5
+Version: 0.9.3
+Release: 0.1
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/configure.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- configure.in 7 Jan 2004 20:08:42 -0000 1.78
+++ configure.in 2 Mar 2004 15:49:59 -0000 1.79
@@ -1,10 +1,10 @@
-dnl# $Id: configure.in,v 1.78 2004/01/07 20:08:42 mej Exp $
+dnl# $Id: configure.in,v 1.79 2004/03/02 15:49:59 mej Exp $
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
export PATH
AC_INIT(src/feature.h)
-AM_INIT_AUTOMAKE(Eterm, 0.9.2)
+AM_INIT_AUTOMAKE(Eterm, 0.9.3)
dnl# Set some basic variables
DATE="`date '+%d %B %Y'`"
@@ -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
