Make perl interface a separate package
Install it as a vendor package. Remove .packlist, perllocal.pod, Git.bs. Require perl(Error) for building so that our Error.pm is not installed. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
1434dbce02
commit
b9795608c4
21
git.spec.in
21
git.spec.in
@ -9,7 +9,7 @@ URL: http://kernel.org/pub/software/scm/git/
|
|||||||
Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
|
Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
|
||||||
BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
|
BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk
|
Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This is a stupid (but extremely fast) directory content manager. It
|
This is a stupid (but extremely fast) directory content manager. It
|
||||||
@ -70,6 +70,16 @@ Requires: git-core = %{version}-%{release}, tk >= 8.4
|
|||||||
%description -n gitk
|
%description -n gitk
|
||||||
Git revision tree visualiser ('gitk')
|
Git revision tree visualiser ('gitk')
|
||||||
|
|
||||||
|
%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)
|
||||||
|
|
||||||
|
%description -n perl-Git
|
||||||
|
Perl interface to Git
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
@ -80,10 +90,14 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
|
|||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
|
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
|
||||||
prefix=%{_prefix} mandir=%{_mandir} \
|
prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
|
||||||
install %{!?_without_docs: install-doc}
|
install %{!?_without_docs: install-doc}
|
||||||
|
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 {} ';'
|
||||||
|
|
||||||
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
|
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
|
||||||
|
(find $RPM_BUILD_ROOT%{perl_vendorarch} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
|
||||||
%if %{!?_without_docs:1}0
|
%if %{!?_without_docs:1}0
|
||||||
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
|
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
|
||||||
%else
|
%else
|
||||||
@ -131,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
|
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
|
||||||
%{!?_without_docs: %doc Documentation/*gitk*.html }
|
%{!?_without_docs: %doc Documentation/*gitk*.html }
|
||||||
|
|
||||||
|
%files -n perl-Git -f perl-files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
|
||||||
%files core -f bin-man-doc-files
|
%files core -f bin-man-doc-files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_datadir}/git-core/
|
%{_datadir}/git-core/
|
||||||
|
Reference in New Issue
Block a user