diff --git a/emacs-w3m.changes b/emacs-w3m.changes index 7fe9af0..e538f7c 100644 --- a/emacs-w3m.changes +++ b/emacs-w3m.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 14 12:34:36 UTC 2018 - jengelh@inai.de + +- Trim bias from description. +- Replace old RPM shell vars by macros. + ------------------------------------------------------------------- Sun Jul 8 12:07:13 UTC 2018 - schwab@linux-m68k.org diff --git a/emacs-w3m.spec b/emacs-w3m.spec index 08b85fe..aca671b 100644 --- a/emacs-w3m.spec +++ b/emacs-w3m.spec @@ -17,7 +17,7 @@ Name: emacs-w3m -Summary: A simple interface program to use w3m with Emacs +Summary: An interface program to use w3m with Emacs License: GPL-2.0-or-later Group: Productivity/Networking/Web/Browsers # Summary(ja): w3m を Emacs 上で動かすためのプログラムです @@ -55,14 +55,12 @@ Obsoletes: w3m-el < %{version} # 考えました. %description -Emacs-w3m is a simple interface program to use w3m with Emacs. +Emacs-w3m (w3m-el) is an interface program to use w3m with Emacs. W3 is the most well known WEB browser which works on (X)Emacs, but it -is very slow. w3m-el is a simple and speedy alternative. - -Emacs-w3m uses w3m, which is a pager with WWW capability, developed by -Akinori ITO. It is a pager, but it can be used as a text-mode WWW -browser. +is very slow. emacs-w3m is an alternative. Emacs-w3m uses w3m, the +latter of which is a pager with WWW capability, developed by Akinori +ITO. It is a pager, but it can be used as a text-mode WWW browser. %prep %setup -q @@ -72,29 +70,26 @@ browser. %define emacs_sitelisp_dir %{_datadir}/emacs/site-lisp %define emacs_package_dir %{emacs_sitelisp_dir}/w3m autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --infodir=%{_infodir} \ +%configure \ --with-lispdir=%{emacs_package_dir} \ --with-icondir=%{emacs_package_dir} \ --with-emacs=emacs make %install -mkdir -p $RPM_BUILD_ROOT%{emacs_package_dir} -make install DESTDIR=$RPM_BUILD_ROOT -make install-icons DESTDIR=$RPM_BUILD_ROOT +mkdir -p %{buildroot}/%{emacs_package_dir} +%make_install install-icons { echo ";; %{emacs_sitelisp_dir}/suse-start-%{name}.el" echo "" echo "(add-to-list 'load-path \"%{emacs_package_dir}\")" echo "" - cat $RPM_SOURCE_DIR/suse-start.el + cat %{_sourcedir}/suse-start.el echo "" echo ";; %{emacs_sitelisp_dir}/suse-start-%{name}.el ends here" } > %{buildroot}%{emacs_sitelisp_dir}/suse-start-%{name}.el -rm -f $RPM_BUILD_ROOT/%{_infodir}/dir -rm -f $RPM_BUILD_ROOT%{emacs_package_dir}/ChangeLog* +rm -f %{buildroot}/%{_infodir}/dir +rm -f %{buildroot}/%{emacs_package_dir}/ChangeLog* %post for i in emacs-w3m emacs-w3m-ja