Hello community, here is the log from the commit of package emacs-vm for openSUSE:Factory checked in at 2017-12-08 13:01:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-vm (Old) and /work/SRC/openSUSE:Factory/.emacs-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs-vm" Fri Dec 8 13:01:00 2017 rev:22 rq:555019 version:8.2.0b Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-vm/emacs-vm.changes 2016-02-26 00:29:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs-vm.new/emacs-vm.changes 2017-12-08 13:01:17.225236155 +0100 @@ -1,0 +2,12 @@ +Thu Dec 7 12:43:45 UTC 2017 - [email protected] + +- Cleanup spec file with spec-cleaner +- Fix rpm group + +------------------------------------------------------------------- +Thu Dec 7 11:06:49 UTC 2017 - [email protected] + +- Escape the usage of %{VERSION} when calling out to rpm. + RPM 4.14 has %{VERSION} defined as 'the main packages version'. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-vm.spec ++++++ --- /var/tmp/diff_new_pack.9qghqK/_old 2017-12-08 13:01:18.661184296 +0100 +++ /var/tmp/diff_new_pack.9qghqK/_new 2017-12-08 13:01:18.661184296 +0100 @@ -1,7 +1,7 @@ # # spec file for package emacs-vm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,27 +17,23 @@ Name: emacs-vm -BuildRequires: emacs-nox -%if %suse_version > 1140 -BuildRequires: makeinfo -%else -BuildRequires: info -%endif -Url: http://www.nongnu.org/viewmail/ -Requires: ed -Requires: emacs -PreReq: %install_info_prereq Version: 8.2.0b Release: 0 Summary: VM - a mail reader for GNU Emacs License: GPL-2.0+ -Group: Productivity/Editors/Emacs +Group: Productivity/Text/Editors +Url: http://www.nongnu.org/viewmail/ Source: https://launchpad.net/vm/8.2.x/%{version}/+download/vm-%{version}.tgz Source2: emacs-vm-autoload.el # PATCH-FIX-UPSTREAM U_rev-1313.patch bsc#939497 [email protected] -- Fix Launchpad lp#793541 and lp#907286 Patch1: U_rev-1313.patch Patch2: U_Require-vm-reply.el-from-vm-compose-mail.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: emacs-nox +BuildRequires: makeinfo +Requires: ed +Requires: emacs +Requires(post): %{install_info_prereq} +Requires(pre): %{install_info_prereq} %description VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read @@ -55,7 +51,7 @@ %define _vmdocdir %{_prefix}/share/doc/packages/%{name} %prep -%setup -n vm-%{version} +%setup -q -n vm-%{version} %patch1 %patch2 -p1 @@ -63,28 +59,27 @@ export LC_CTYPE=ISO-8859-1 export EMACS_UNIBYTE=1 EMACS="emacs --no-site" -emacs_ver=$(rpm -q --qf '%{VERSION}' emacs) +emacs_ver=$(rpm -q --qf '%%{VERSION}' emacs) rm -rf lisp/*.elc %configure FLAGS="-batch -q -no-site-file -no-init-file -l \$(srcdir)/vm-build.el" --with-etcdir=%{_vmetcdir} --with-docdir=%{_vmdocdir} -make DESTDIR=${RPM_BUILD_ROOT} MAKEINFO="makeinfo --force" +make %{?_smp_mflags} DESTDIR=%{buildroot} MAKEINFO="makeinfo --force" %install -mkdir -p ${RPM_BUILD_ROOT} -make DESTDIR=${RPM_BUILD_ROOT} install +mkdir -p %{buildroot} +%make_install { - echo ";; /usr/share/emacs/site-lisp/suse-start-%{name}.el" - cat %{S:2} - echo ";; /usr/share/emacs/site-lisp/suse-start-%{name}.el ends here" -} > ${RPM_BUILD_ROOT}%{_sitedir}/suse-start-%{name}.el + echo ";; %{_datadir}/emacs/site-lisp/suse-start-%{name}.el" + cat %{SOURCE2} + echo ";; %{_datadir}/emacs/site-lisp/suse-start-%{name}.el ends here" +} > %{buildroot}%{_sitedir}/suse-start-%{name}.el %post -%install_info --info-dir=%{_infodir} %{_infodir}/vm.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/vm.info%{ext_info} -%postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/vm.info.gz +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/vm.info%{ext_info} %files -%defattr(-, root, root) %docdir %{_vmdocdir} %{_vmdocdir} %dir %{_sitedir} @@ -93,17 +88,17 @@ %{_vmdir}/*.el %{_vmdir}/*.elc %{_vmdir}/version.txt -/usr/bin/base64-encode -/usr/bin/base64-decode -/usr/bin/qp-decode -/usr/bin/qp-encode -%doc %{_infodir}/*.gz -%{_prefix}/share/emacs/*/etc/vm/pixmaps -%dir %{_prefix}/share/emacs/*/etc/vm -%exclude %{_prefix}/share/emacs/*/etc/vm/README -%exclude %{_prefix}/share/emacs/*/etc/vm/CHANGES -%exclude %{_prefix}/share/emacs/*/etc/vm/COPYING -%exclude %{_prefix}/share/emacs/*/etc/vm/NEWS -%exclude %{_prefix}/share/emacs/*/etc/vm/TODO +%{_bindir}/base64-encode +%{_bindir}/base64-decode +%{_bindir}/qp-decode +%{_bindir}/qp-encode +%{_infodir}/*%{ext_info} +%{_datadir}/emacs/*%{_sysconfdir}/vm/pixmaps +%dir %{_datadir}/emacs/*%{_sysconfdir}/vm +%exclude %{_datadir}/emacs/*%{_sysconfdir}/vm/README +%exclude %{_datadir}/emacs/*%{_sysconfdir}/vm/CHANGES +%exclude %{_datadir}/emacs/*%{_sysconfdir}/vm/COPYING +%exclude %{_datadir}/emacs/*%{_sysconfdir}/vm/NEWS +%exclude %{_datadir}/emacs/*%{_sysconfdir}/vm/TODO %changelog
