[eterm] 0.9.6 Don't use %makeinstall Fix ChangeLog Drop patches Remove rpath Fix defattr and files listing

terjeros terjeros at fedoraproject.org
Mon Oct 17 11:59:08 UTC 2011 

commit 35754d58e47a1a387171af6610a970cf5e9834d1
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Oct 17 13:59:05 2011 +0200

    0.9.6
    Don't use %makeinstall
    Fix ChangeLog
    Drop patches
    Remove rpath
    Fix defattr and files listing

 .gitignore                           |    2 +
 Eterm-0.9.4-automake-1.10.patch      |   13 -----
 Eterm-0.9.4-no-rpath.patch           |   22 ---------
 Eterm-0.9.5-drop-kde-cut-paste.patch |   23 ---------
 eterm.spec                           |   83 +++++++++++++++++++---------------
 sources                              |    4 +-
 6 files changed, 50 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61210ae..111376e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 Eterm-0.9.5.tar.gz
 Eterm-bg-0.9.5.tar.gz
+/Eterm-0.9.6.tar.gz
+/Eterm-bg-0.9.6.tar.gz
diff --git a/eterm.spec b/eterm.spec
index d57111d..7680d4f 100644
--- a/eterm.spec
+++ b/eterm.spec
@@ -1,21 +1,24 @@
 Summary:       Enlightened terminal emulator
 Name:          eterm
-Version:       0.9.5
-Release:       8%{?dist}
+Version:       0.9.6
+Release:       1%{?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-%{version}.tar.gz
 Source2:       %{name}.png
-Patch1:        Eterm-0.9.4-no-rpath.patch
-Patch2:        Eterm-0.9.4-automake-1.10.patch
-Patch3:        Eterm-0.9.5-drop-kde-cut-paste.patch
 URL:           http://www.eterm.org/
-Requires:      imlib2 xorg-x11-fonts-misc
-Requires:      xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-1-100dpi
-BuildRequires: imlib2-devel libast-devel libXmu-devel 
-BuildRequires: pcre-devel desktop-file-utils gawk
-BuildRequires: autoconf automake libtool
+Requires:      xorg-x11-fonts-misc
+Requires:      xorg-x11-fonts-ISO8859-1-75dpi
+Requires:      xorg-x11-fonts-ISO8859-1-100dpi
+BuildRequires: sed
+BuildRequires: gawk
+BuildRequires: pcre-devel
+BuildRequires: imlib2-devel
+BuildRequires: libast-devel
+BuildRequires: libXmu-devel
+BuildRequires: glibc-common
+BuildRequires: desktop-file-utils
 Provides:      Eterm = %{version}-%{release}
 Obsoletes:     Eterm <= 0.9.2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,30 +33,31 @@ philosophy of Enlightenment.
 
 %prep
 %setup -a 1 -q -n Eterm-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+for f in ChangeLog ; do
+    mv $f $f.iso88591
+    iconv -o $f -f iso88591 -t utf8 $f.iso88591
+    rm -f $f.iso88591
+done
 
 %build
-# Touching Makefile.am
-./autogen.sh
 %configure --enable-multi-charset \
            --enable-escreen       \
            --enable-auto-encoding \
            --enable-trans         \
            --disable-etwin        \
-           --disable-mmx
-
+           --disable-mmx          \
+           --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-
-%makeinstall
+%{__make} DESTDIR=%{buildroot} install
 
 echo -e "[Desktop Entry]
 Encoding=UTF-8
-Name=Eterm	
+Name=Eterm
 Comment=Eterm
 TryExec=Eterm
 Exec=Eterm
@@ -63,11 +67,9 @@ Categories=Utility;TerminalEmulator;System;" > %{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  \
+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/
 
@@ -78,11 +80,10 @@ desktop-file-install --vendor fedora --delete-original           \
 %{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root, 0755)
-%doc doc/Eterm_reference.html doc/Eterm.1.html doc/Eterm.tcap 
+%defattr(-, root, root, -)
+%doc doc/Eterm_reference.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
@@ -92,28 +93,36 @@ desktop-file-install --vendor fedora --delete-original           \
 %{_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}/Eterm
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
+%exclude %{_libdir}/libEterm.a
+%exclude %{_libdir}/libEterm.la
+%exclude %{_libdir}/libEterm.so
 
 %changelog
+* Mon Oct 17 2011 Terje Røsten <terje.rosten at ntnu.no> - 0.9.6-1
+- 0.9.6
+- Don't use %%makeinstall
+- Fix ChangeLog
+- Drop patches
+- Remove rpath
+- Fix defattr and files listing
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Mon Mar  1 2010 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-7
+* Mon Mar 01 2010 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-7
 - Remove req. on bitmap-fonts, not needed.
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Wed Apr  1 2009 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-5
+* Wed Apr 01 2009 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-5
 - Add xorg-x11-fonts-misc to req.
 
-* Sun Mar  1 2009 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-4
+* Sun Mar 01 2009 Terje Røsten <terje.rosten at ntnu.no> - 0.9.5-4
 - Add more fonts to req.
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-3
@@ -127,15 +136,15 @@ desktop-file-install --vendor fedora --delete-original           \
 - Remove CVE-2008-1692 patch now upstream
 - Add req on bitmap-fonts to bring in some fonts (bz #454937)
 
-* Tue Apr  8 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-10
+* Tue Apr 08 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-10
 - Closing CVE-2008-1692
 
-* Sat Feb  9 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-9
+* Sat Feb 09 2008 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-9
 - Rebuild
 
 * Tue Aug 28 2007 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-8
 - Need gawk to build
-	
+
 * Tue Aug 28 2007 Terje Røsten <terje.rosten at ntnu.no> - 0.9.4-7
 - Rebuild
 
diff --git a/sources b/sources
index 7ab6530..ff7745e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-87220a61f763d111a4f5fc88ef9e50f1  Eterm-0.9.5.tar.gz
-e8c6567b13d7fb760bded56c1d1a181d  Eterm-bg-0.9.5.tar.gz
+90e424584c22d4050496874d14f78bb1  Eterm-0.9.6.tar.gz
+e8c6567b13d7fb760bded56c1d1a181d  Eterm-bg-0.9.6.tar.gz

More information about the scm-commits mailing list