Attachment 151795 Details for Bug 235431 – Emacs support, other small specfile tweaks

[patch] Emacs support, other small specfile tweaks

git.spec.patch (text/plain), 3.37 KB, created by Ville Skyttä on 2007-04-05 18:34:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-04-05 18:34:21 UTC

Size: 3.37 KB

patch

obsolete

>Index: git.spec
>===================================================================
>RCS file: /cvs/extras/rpms/git/devel/git.spec,v
>retrieving revision 1.31
>diff -u -r1.31 git.spec
>--- git.spec	30 Mar 2007 17:50:32 -0000	1.31
>+++ git.spec	5 Apr 2007 18:33:45 -0000
>@@ -7,9 +7,10 @@
> Group: 		Development/Tools
> URL: 		http://kernel.org/pub/software/scm/git/
> Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
>-BuildRequires:	perl-devel, zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
>+Source1: 	git-init.el
>+BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-Requires:	git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git
>+Requires:	git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git, emacs-git
> 
> %description
> Git is a fast, scalable, distributed revision control system with an
>@@ -62,24 +63,33 @@
> Group:          Development/Tools
> Requires:       git-core = %{version}-%{release}, tk >= 8.4
> %description gui
>-Git GUI tool
>+Git GUI tool.
> 
> %package -n gitk
>-Summary:        Git revision tree visualiser ('gitk')
>+Summary:        Git revision tree visualiser
> Group:          Development/Tools
> Requires:       git-core = %{version}-%{release}, tk >= 8.4
> %description -n gitk
>-Git revision tree visualiser ('gitk')
>+Git revision tree visualiser.
> 
> %package -n perl-Git
> Summary:        Perl interface to Git
> Group:          Development/Libraries
> Requires:       git-core = %{version}-%{release}
> Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
>-BuildRequires:  perl(Error)
>+BuildRequires:  perl(Error), perl(ExtUtils::MakeMaker)
> 
> %description -n perl-Git
>-Perl interface to Git
>+Perl interface to Git.
>+
>+%package -n emacs-git
>+Summary:        Git version control system support for Emacs
>+Group:          Applications/Editors
>+Requires:       git-core = %{version}-%{release}, emacs-common
>+
>+%description -n emacs-git
>+%{summary}.
>+
> 
> %prep
> %setup -q
>@@ -87,6 +97,7 @@
> %build
> make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
>      prefix=%{_prefix} all %{!?_without_docs: doc}
>+make -C contrib/emacs
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>@@ -94,6 +105,14 @@
>      WITH_OWN_SUBPROCESS_PY=YesPlease \
>      prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
>      install %{!?_without_docs: install-doc}
>+make -C contrib/emacs install \
>+     emacsdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
>+for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do
>+     install -pm 644 contrib/emacs/$(basename $elc .elc).el \
>+          $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
>+done
>+install -Dpm 644 %{SOURCE1} \
>+     $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
> find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
> find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
> find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
>@@ -160,6 +179,11 @@
> %files -n perl-Git -f perl-files
> %defattr(-,root,root)
> 
>+%files -n emacs-git
>+%defattr(-,root,root)
>+%{_datadir}/emacs/site-lisp/*git*.el*
>+%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
>+
> %files core -f bin-man-doc-files
> %defattr(-,root,root)
> %{_datadir}/git-core/

Actions: View | Diff

Attachments on bug 235431: 151795 | 151796