rpms/eterm/devel Eterm-0.9.4-no-rpath.patch, NONE, 1.1 eterm.png, NONE, 1.1 eterm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Terje Røsten (terjeros) fedora-extras-commits at redhat.com
Sat Nov 25 21:44:36 UTC 2006


Author: terjeros

Update of /cvs/extras/rpms/eterm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Eterm-0.9.4-no-rpath.patch eterm.png eterm.spec 
Log Message:
auto-import eterm-0.9.4-2.fc6 on branch devel from eterm-0.9.4-2.fc6.src.rpm

Eterm-0.9.4-no-rpath.patch:

--- NEW FILE Eterm-0.9.4-no-rpath.patch ---
diff -uNr Eterm-0.9.4.orig/src/Makefile.am Eterm-0.9.4/src/Makefile.am
--- Eterm-0.9.4.orig/src/Makefile.am	2006-08-22 20:23:11.000000000 +0200
+++ Eterm-0.9.4/src/Makefile.am	2006-09-02 18:27:49.000000000 +0200
@@ -36,7 +36,6 @@
 
 Eterm_SOURCES = main.c
 Eterm_DEPENDENCIES = libEterm.la
-Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 Eterm_LDADD = libEterm.la 
 
 EXTRA_DIST = gdb.scr mmx_cmod.S sse2_cmod.c
diff -uNr Eterm-0.9.4.orig/utils/Makefile.am Eterm-0.9.4/utils/Makefile.am
--- Eterm-0.9.4.orig/utils/Makefile.am	2005-04-26 15:42:09.000000000 +0200
+++ Eterm-0.9.4/utils/Makefile.am	2006-09-02 18:28:01.000000000 +0200
@@ -4,7 +4,6 @@
 bin_SCRIPTS = Etcolors Etsearch kEsetroot Etbg_update_list
 
 Esetroot_SOURCES = Esetroot.c
-Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 Etbg_SOURCES = Etbg.c
 Ettable_SOURCES = Ettable.c


--- NEW FILE eterm.spec ---
Summary: Enlightened terminal emulator
Name: eterm
Version: 0.9.4
Release: 2%{?dist}
License: BSD
Group: User Interface/Desktops
Source0: http://www.eterm.org/download/Eterm-%{version}.tar.gz
Source1: http://www.eterm.org/download/Eterm-bg-0.9.4.tar.gz
Source2: %{name}.png
Patch: Eterm-0.9.4-no-rpath.patch
URL: http://www.eterm.org/
Requires: imlib2
BuildRequires: imlib2-devel libast-devel libXmu-devel 
BuildRequires: pcre-devel desktop-file-utils
BuildRequires: autoconf automake libtool
Provides: Eterm = %{version}-%{release}
Obsoletes: Eterm <= 0.9.2
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Eterm is a color vt102 terminal emulator with enhanced graphical
capabilities.  Eterm is intended to be a replacement for xterm for
Enlightenment window manager users, but it can also be used as a
replacement for xterm by users without Enlightenment.  Eterm supports
various themes and is very configurable, in keeping with the
philosophy of Enlightenment.

%prep
%setup -a 1 -q -n Eterm-%{version}
%patch -p1

%build
# Touching Makefile.am
./autogen.sh
%configure --enable-multi-charset \
           --enable-escreen       \
           --enable-auto-encoding \
           --enable-trans         \
           --disable-etwin        \
           --disable-mmx

%{__make}

%install
rm -rf %{buildroot}

%makeinstall

echo -e "[Desktop Entry]
Encoding=UTF-8
Name=Eterm	
Comment=Eterm
TryExec=Eterm
Exec=Eterm
Icon=eterm.png
Type=Application
Categories=Application;Utility;TerminalEmulator;" > %{name}.desktop

install -d %{buildroot}%{_datadir}/applications
install -m 0644 %{name}.desktop %{buildroot}%{_datadir}/applications

desktop-file-install --vendor fedora --delete-original           \
  --dir %{buildroot}%{_datadir}/applications  \
  %{buildroot}%{_datadir}/applications/%{name}.desktop

install -d %{buildroot}%{_datadir}/pixmaps
install -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root, 0755)
%doc doc/Eterm_reference.html doc/Eterm.1.html doc/Eterm.tcap 
%doc doc/Eterm.ti doc/README.Escreen LICENSE
%doc README ReleaseNotes ReleaseNotes.1 ChangeLog
%dir %{_datadir}/Eterm
%{_bindir}/Esetroot
%{_bindir}/Etbg
%{_bindir}/Etbg_update_list
%{_bindir}/Etcolors
%{_bindir}/Eterm
%{_bindir}/Etsearch
%{_bindir}/Ettable
%{_bindir}/kEsetroot
%{_libdir}/libEterm-%{version}.so
%exclude %{_libdir}/libEterm.a
%exclude %{_libdir}/libEterm.la
%exclude %{_libdir}/libEterm.so
%{_mandir}/man1/Eterm.1*
%{_datadir}/Eterm/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png

%changelog
* Fri Nov 24 2006 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-2
- Add libXmu-devel and pcre-devel to BuildReq
- Simplify desktop file handling
- Add --disable-etwin to configure

* Sat Sep  2 2006 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-1
- 0.9.4
- LICENSE now included in upstream package
- Add rpath patch
- Touching Makefile.am, add auto* tools buildreq.

* Sun Feb 19 2006 Terje Røsten <terje.rosten at ntnu.no> - 0.9.3-2
- Add LICENSE
- UTF-8 specfile
- Fix buildroot var
- Not explicit depend on libast

* Sun Feb 19 2006 Terje Røsten <terje.rosten at ntnu.no> - 0.9.3-1
- 0.9.3

* Wed Nov 13 2002 Che
- initial rpm release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Nov 2006 21:43:13 -0000	1.1
+++ .cvsignore	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1,2 @@
+Eterm-0.9.4.tar.gz
+Eterm-bg-0.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eterm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Nov 2006 21:43:13 -0000	1.1
+++ sources	25 Nov 2006 21:44:06 -0000	1.2
@@ -0,0 +1,2 @@
+b8869ee9c9b9516231af9eefa595cee3  Eterm-0.9.4.tar.gz
+e8c6567b13d7fb760bded56c1d1a181d  Eterm-bg-0.9.4.tar.gz




More information about the fedora-extras-commits mailing list