From afda3ff59a431ea32b09f4933f7c017bfcaa5087 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Fri, 28 Apr 2000 02:42:26 +0000 Subject: [PATCH] Thu Apr 27 19:54:28 PDT 2000 Michael Jennings Made some changes to the build process that should fix things for people without shared library dependencies working. SVN revision: 2570 --- ChangeLog | 6 ++++ Eterm.spec.in | 93 +++++++++++++++++++++++++------------------------ configure.in | 10 +++--- src/Makefile.am | 2 +- 4 files changed, 59 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9ffc3b..7089925 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3524,3 +3524,9 @@ Tue Apr 25 11:45:15 PDT 2000 Michael Jennings Updated per changes to Imlib2 API. ------------------------------------------------------------------------------- +Thu Apr 27 19:54:28 PDT 2000 Michael Jennings + + Made some changes to the build process that should fix things for + people without shared library dependencies working. + +------------------------------------------------------------------------------- diff --git a/Eterm.spec.in b/Eterm.spec.in index 8e41994..9a2d192 100644 --- a/Eterm.spec.in +++ b/Eterm.spec.in @@ -1,17 +1,18 @@ +%define name @PACKAGE@ %define ver @VERSION@ -%define rel 4 +%define rel 1 %define prefix @prefix@ Summary: Enlightened terminal emulator -Name: Eterm +Name: %{name} Version: %{ver} Release: %{rel} Copyright: BSD Group: User Interface/X -Source0: ftp://ftp.eterm.org/pub/Eterm/Eterm-%{ver}.tar.bz2 -Source1: ftp://ftp.eterm.org/pub/Eterm/Eterm-bg-%{ver}.tar.bz2 +Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{ver}.tar.gz +Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{ver}.tar.gz URL: http://www.eterm.org/ -BuildRoot: /var/tmp/Eterm-root +BuildRoot: /var/tmp/%{name}-root Requires: imlib >= 1.9.6 %description @@ -26,15 +27,15 @@ have the Imlib library installed. %package backgrounds Summary: Backgrounds for Eterm Group: User Interface/X -Requires: Eterm = %{ver} +Requires: %{name} = %{ver} %description backgrounds Install this package if you want additional backgrounds for Eterm %prep -%setup -q -n Eterm-%{ver} 1 +%setup -q -n %{name}-%{ver} 1 %build -%configure --with-backspace=bs --with-delete=execute +%configure --prefix=%{prefix} --with-backspace=bs --with-delete=execute make CFLAGS="$RPM_OPT_FLAGS" %install @@ -42,21 +43,21 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/X11/wmconfig/ -cat > $RPM_BUILD_ROOT/etc/X11/wmconfig/Eterm < $RPM_BUILD_ROOT/etc/X11/wmconfig/%{name} < rpm-Eterm-bg-files cat > rpm-Eterm-bg-files <> rpm-Eterm-bg-files + | sed "s#^\./bg/[scati]*le#%{prefix}/share/%{name}/pix#g" >> rpm-Eterm-bg-files %post /sbin/ldconfig for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \ - mv -f %{prefix}/share/Eterm/pix/$i.base %{prefix}/share/Eterm/pix/$i ; done + mv -f %{prefix}/share/%{name}/pix/$i.base %{prefix}/share/%{name}/pix/$i ; done %postun /sbin/ldconfig for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \ - rm -f %{prefix}/share/Eterm/pix/$i* ; done + rm -f %{prefix}/share/%{name}/pix/$i* ; done %pre backgrounds for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \ - mv -f %{prefix}/share/Eterm/pix/$i %{prefix}/share/Eterm/pix/$i.base ; done + mv -f %{prefix}/share/%{name}/pix/$i %{prefix}/share/%{name}/pix/$i.base ; done %postun backgrounds for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \ - mv -f %{prefix}/share/Eterm/pix/$i.base %{prefix}/share/Eterm/pix/$i ; done + mv -f %{prefix}/share/%{name}/pix/$i.base %{prefix}/share/%{name}/pix/$i ; done %clean rm -rf $RPM_BUILD_ROOT @@ -115,29 +116,29 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc doc/Eterm_reference.html doc/Eterm.1.html %doc COPYING README ChangeLog -%config(missingok) %{prefix}/share/Eterm/pix/*.list.base -/etc/X11/wmconfig/Eterm +%config(missingok) %{prefix}/share/%{name}/pix/*.list.base +/etc/X11/wmconfig/%{name} %{prefix}/bin/* %{prefix}/lib/* %{prefix}/man/man1/* -%{prefix}/share/Eterm/themes -%{prefix}/share/Eterm/pix/014.jpg -%{prefix}/share/Eterm/pix/40.jpg -%{prefix}/share/Eterm/pix/blackstone.jpg -%{prefix}/share/Eterm/pix/backwave.jpg -%{prefix}/share/Eterm/pix/circuit.jpg -%{prefix}/share/Eterm/pix/nebula.jpg -%{prefix}/share/Eterm/pix/fourthday.jpg -%{prefix}/share/Eterm/pix/gaia.jpg -%{prefix}/share/Eterm/pix/galleon.jpg -%{prefix}/share/Eterm/pix/night_of_the_dragon.jpg -%{prefix}/share/Eterm/pix/bar_horizontal_[123].png -%{prefix}/share/Eterm/pix/bar_vertical_[123].png -%{prefix}/share/Eterm/pix/button_arrow_up_[123].png -%{prefix}/share/Eterm/pix/button_arrow_down_[123].png -%{prefix}/share/Eterm/pix/menu[123].png -%dir %{prefix}/share/Eterm -%dir %{prefix}/share/Eterm/pix +%{prefix}/share/%{name}/themes +%{prefix}/share/%{name}/pix/014.jpg +%{prefix}/share/%{name}/pix/40.jpg +%{prefix}/share/%{name}/pix/blackstone.jpg +%{prefix}/share/%{name}/pix/backwave.jpg +%{prefix}/share/%{name}/pix/circuit.jpg +%{prefix}/share/%{name}/pix/nebula.jpg +%{prefix}/share/%{name}/pix/fourthday.jpg +%{prefix}/share/%{name}/pix/gaia.jpg +%{prefix}/share/%{name}/pix/galleon.jpg +%{prefix}/share/%{name}/pix/night_of_the_dragon.jpg +%{prefix}/share/%{name}/pix/bar_horizontal_[123].png +%{prefix}/share/%{name}/pix/bar_vertical_[123].png +%{prefix}/share/%{name}/pix/button_arrow_up_[123].png +%{prefix}/share/%{name}/pix/button_arrow_down_[123].png +%{prefix}/share/%{name}/pix/menu[123].png +%dir %{prefix}/share/%{name} +%dir %{prefix}/share/%{name}/pix %files backgrounds -f rpm-Eterm-bg-files diff --git a/configure.in b/configure.in index 015f86e..e7054f6 100644 --- a/configure.in +++ b/configure.in @@ -291,15 +291,15 @@ AC_ARG_WITH(imlib, USE_IMLIB=1 ) if test $USE_IMLIB -eq 1 ; then + AC_CHECK_LIB(m, pow, GRLIBS="-lm", , $SUBLIBS $X_LIBS $GRLIBS) + AC_CHECK_LIB(dl, dlopen, GRLIBS="-ldl $GRLIBS", , $SUBLIBS $X_LIBS $GRLIBS) + AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $SUBLIBS $X_LIBS $GRLIBS) AC_CHECK_LIB(Imlib2, imlib_create_image, - GRLIBS="-lImlib2" - AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="$GRLIBS -lttf", , $SUBLIBS $X_LIBS) - AC_CHECK_LIB(dl, dlopen, GRLIBS="$GRLIBS -ldl", , $SUBLIBS $X_LIBS) - AC_CHECK_LIB(m, pow, GRLIBS="$GRLIBS -lm", , $SUBLIBS $X_LIBS) + GRLIBS="-lImlib2 $GRLIBS" AC_DEFINE(PIXMAP_SUPPORT) AC_DEFINE(BACKING_STORE) , - , $SUBLIBS $X_LIBS) + , $SUBLIBS $X_LIBS $GRLIBS) fi diff --git a/src/Makefile.am b/src/Makefile.am index d935604..e504a40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,4 +20,4 @@ Eterm_DEPENDENCIES = libEterm.la Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) -LDADD = libEterm.la $(top_builddir)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) +LDADD = libEterm.la $(top_builddir)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(X_LIBS) $(GRLIBS) $(LIBS)