From 5e2007f84f1c350285786fc65874067cdb34bb14 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Fri, 6 Mar 2020 16:45:21 +0000 Subject: [PATCH] add hack --- git.spec | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/git.spec b/git.spec index 6e7305c..33652ed 100644 --- a/git.spec +++ b/git.spec @@ -1,6 +1,8 @@ %define devname %mklibname git -d %define profile_branch 93git-branch.sh %define profile_env 93git-env.sh +# it's a hack remove it after perl upgrade +%define perl_vendorlib /usr/share/perl5/vendor_perl Summary: Global Information Tracker Name: git @@ -216,8 +218,29 @@ Requires: git-core = %{EVRD} Perl interface to Git %files -n perl-Git -%{perl_vendorlib}/* -%{_mandir}/man3/* +%{perl_vendorlib}/Git.pm +%dir %{perl_vendorlib}/Git +%{perl_vendorlib}/Git/I18N.pm +%{perl_vendorlib}/Git/IndexInfo.pm +%{perl_vendorlib}/Git/Packet.pm +%{perl_vendorlib}/FromCPAN +%{perl_vendorlib}/Git/LoadCPAN.pm +%{perl_vendorlib}/Git/LoadCPAN +%{_mandir}/man3/Git.3pm* + +#---------------------------------------------------------------------------- + +%package -n perl-Git-SVN +Summary: Perl interface to Git SVN +Group: Development/Perl +Requires: perl-Git = %{EVRD} + +%description -n perl-Git-SVN +Perl interface to Git SVN. + +%files -n perl-Git-SVN +%{perl_vendorlib}/Git/SVN +%{perl_vendorlib}/Git/SVN.pm #---------------------------------------------------------------------------- @@ -275,7 +298,7 @@ perl -pi -e 's!^(GITWEB_CSS|GITWEB_LOGO|GITWEB_FAVICON) = !$1 = /gitweb/!' Makef %build # same flags and prefix must be passed for make test too -%define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1 +%define git_make_params prefix=%{_prefix} CC=%{__cc} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=0 INSTALLDIRS=vendor perllibdir=%{perl_vendorlib} %make %{git_make_params} all doc gitweb # Produce RelNotes.txt.gz @@ -287,7 +310,7 @@ cd Documentation/RelNotes \ %install mkdir -p %{buildroot}%{_bindir} -%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" +%make_install %{?with_docs:install-doc} CC=%{__cc} AR=%{__ar} prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" INSTALLDIRS=vendor perllibdir=%{perl_vendorlib} make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} # Avoid dependencies on obscure perl modules @@ -299,14 +322,6 @@ cp *.h %{buildroot}%{_includedir}/git mkdir -p %{buildroot}%{_libdir} install -m 644 libgit.a %{buildroot}%{_libdir}/libgit.a mkdir -p %{buildroot}/%{perl_vendorlib} -# this is hack -# remove after perl upgrade -# 05.03.2020 -%ifnarch %{armx} -mv %{buildroot}/%{_prefix}/share/perl5/* %{buildroot}/%{perl_vendorlib}/ -%endif -# hack ends -rm -fr %{buildroot}/%{perl_vendorlib}/FromCPAN rm -f %{buildroot}%{_mandir}/man3/private-Error.3pm* mkdir -p %{buildroot}%{_datadir}/gitweb/static