Attachment 301354 Details for Bug 441008 – Patch for spec file to conform to Emacs guidelines

[patch] Patch for spec file to conform to Emacs guidelines

hg-fix-for-emacs-guidelines.diff (text/plain), 5.52 KB, created by Jonathan Underwood on 2008-04-05 00:19:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Underwood

Created: 2008-04-05 00:19:35 UTC

Size: 5.52 KB

patch

obsolete

>Index: mercurial.spec
>===================================================================
>RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v
>retrieving revision 1.34
>diff -u -r1.34 mercurial.spec
>--- mercurial.spec	26 Mar 2008 14:57:05 -0000	1.34
>+++ mercurial.spec	5 Apr 2008 00:14:19 -0000
>@@ -1,3 +1,28 @@
>+# If the emacs-el package has installed a pkgconfig file, use that to determine
>+# install locations and Emacs version at build time, otherwise set defaults.
>+%if %($(pkg-config emacs) ; echo $?)
>+%define emacs_version 22.1
>+%define emacs_lispdir %{_datadir}/emacs/site-lisp
>+%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
>+%else
>+%define emacs_version %(pkg-config emacs --modversion)
>+%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
>+%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
>+%endif
>+
>+# If the xemacs-devel package has installed a pkgconfig file, use that to determine
>+# install locations and Emacs version at build time, otherwise set defaults.
>+%if %($(pkg-config xemacs) ; echo $?)
>+%define xemacs_version 21.5
>+%define xemacs_lispdir %{_datadir}/xemacs/site-packages
>+%define xemacs_startdir %{_datadir}/xemacs/site-packages/site-start.d
>+%else
>+%define xemacs_version %(pkg-config xemacs --modversion)
>+%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
>+%define xemacs_startdir %(pkg-config xemacs --variable sitestartdir)
>+%endif
>+
>+
> Summary: A fast, lightweight distributed source control management system 
> Name: mercurial
> Version: 1.0
>@@ -9,6 +34,8 @@
> Source1: mercurial-site-start.el
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildRequires: python-devel asciidoc xmlto
>+BuildRequires: emacs emacs-el 
>+BuildRequires: xemacs xemacs-devel
> Requires: python
> Provides: hg = %{version}-%{release}
> 
>@@ -20,13 +47,45 @@
> Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
> Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
> 
>-%package emacs
>-Summary:	Mercurial version control system support for Emacs
>+%package -n emacs-mercurial
>+Summary:	Mercurial version control system support for GNU Emacs
> Group:		Applications/Editors
>-Requires:	hg = %{version}-%{release}, emacs-common
>+Requires:	hg = %{version}-%{release}
>+Requires:	emacs(bin) >= %{emacs_version}
>+Provides:	mercurial-emacs = %{version}-%{release}
> 
>-%description emacs
>-%{summary}.
>+%description -n emacs-mercurial
>+%{summary}. This package provides mercurial support for GNU Emacs.
>+
>+%package -n emacs-mercurial-el
>+Summary:	Elisp source files for GNU Emacs support of mercurial
>+Group:		Applications/Editors
>+Requires:	emacs-mercurial = %{version}-%{release}
>+Provides:	mercurial-emacs-el = %{version}-%{release}
>+
>+%description -n emacs-mercurial-el
>+%{summary}. This package contains the elisp source files for supporting
>+mercurial under GNU Emacs.
>+
>+%package -n xemacs-mercurial
>+Summary:	Mercurial version control system support for GNU Emacs
>+Group:		Applications/Editors
>+Requires:	hg = %{version}-%{release}
>+Requires:	xemacs(bin) >= %{xemacs_version}
>+Provides:	mercurial-xemacs = %{version}-%{release}
>+
>+%description -n xemacs-mercurial
>+%{summary}. This package provides mercurial support for XEmacs.
>+
>+%package -n xemacs-mercurial-el
>+Summary:	Elisp source files for XEmacs support of mercurial
>+Group:		Applications/Editors
>+Requires:	xemacs-mercurial = %{version}-%{release}
>+Provides:	mercurial-xemacs-el = %{version}-%{release}
>+
>+%description -n xemacs-mercurial-el
>+%{summary}. This package contains the elisp source files for supporting
>+mercurial under XEmacs.
> 
> %package hgk
> Summary:	Hgk interface for mercurial
>@@ -66,16 +125,21 @@
> mkdir -p $zsh_completion_dir
> install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
> 
>-lisp_dir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
>-mkdir -p $lisp_dir
>-install -m 644 contrib/mercurial.el $lisp_dir
>-xlisp_dir=$RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp
>-mkdir -p $xlisp_dir
>-install -m 644 contrib/mercurial.el $xlisp_dir
>+pushd contrib
>+mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/mercurial
>+mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/mercurial
>+for i in mercurial.el mq.el ; do
>+    emacs -batch --no-site-file -f batch-byte-compile $i
>+    install -m 644 -p $i ${i}c $RPM_BUILD_ROOT%{emacs_lispdir}/mercurial
>+    xemacs -batch --no-site-file -f batch-byte-compile $i
>+    install -m 644 -p $i ${i}c $RPM_BUILD_ROOT%{xemacs_lispdir}/mercurial
>+done
>+popd
>+
> mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
> 
>-mkdir -p $lisp_dir/site-start.d/ && install -m644 %SOURCE1 $lisp_dir/site-start.d/
>-mkdir -p $xlisp_dir/site-start.d/ && install -m644 %SOURCE1 $xlisp_dir/site-start.d/
>+mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{emacs_startdir}
>+mkdir -p $RPM_BUILD_ROOT%{xemacs_startdir} && install -m644 %SOURCE1 $RPM_BUILD_ROOT%{xemacs_startdir}
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -94,11 +158,21 @@
> %dir %{_sysconfdir}/mercurial
> %dir %{_sysconfdir}/mercurial/hgrc.d
> 
>-%files emacs
>-%{_datadir}/emacs/site-lisp/mercurial.el
>-%{_datadir}/xemacs/site-packages/lisp/mercurial.el
>-%{_datadir}/emacs/site-lisp/site-start.d/*
>-%{_datadir}/xemacs/site-packages/lisp/site-start.d/*
>+%files -n emacs-mercurial
>+%dir %{emacs_lispdir}/mercurial
>+%{emacs_lispdir}/mercurial/*.elc
>+%{emacs_startdir}/*
>+
>+%files -n emacs-mercurial-el
>+%{emacs_lispdir}/mercurial/*.el
>+
>+%files -n xemacs-mercurial
>+%dir %{xemacs_lispdir}/mercurial
>+%{xemacs_lispdir}/mercurial/*.elc
>+%{xemacs_startdir}/*
>+
>+%files -n xemacs-mercurial-el
>+%{xemacs_lispdir}/mercurial/*.el
> 
> %files hgk
> %{_bindir}/hgk

Actions: View | Diff

Attachments on bug 441008: 301354