Minor spec cleanups

This commit is contained in:
Andrey Bondrov 2016-04-07 21:43:19 +10:00
parent 43b99726e9
commit cf357491a2

View file

@ -1,4 +1,4 @@
%define libname %mklibname git
%define devname %mklibname git -d
%define profile_branch 93git-branch.sh
%define profile_env 93git-env.sh
@ -89,12 +89,12 @@ Requires: python-gtksourceview
%description -n gitview
Git graphical revision tree visualiser.
%package -n %{libname}-devel
%package -n %{devname}
Summary: Git development files
Group: Development/Other
Provides: git-devel = %{version}-%{release}
%description -n %{libname}-devel
%description -n %{devname}
Development files for git.
%package -n git-svn
@ -196,34 +196,33 @@ cd Documentation/RelNotes \
&& awk 'FNR == 1 { print "" } { print }' $relnotesls | gzip -9c >../RelNotes.txt.gz
%install
%__rm -rf %{buildroot}
%__mkdir_p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_bindir}
%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}"
make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
# (cg) Copy the whole contrib dir as docs. It contains useful scripts.
%__mkdir_p %{buildroot}%{_datadir}/doc/git-core
%__cp -ar contrib %{buildroot}%{_datadir}/doc/git-core
mkdir -p %{buildroot}%{_datadir}/doc/git-core
cp -ar contrib %{buildroot}%{_datadir}/doc/git-core
# (cg) Even tho' we copy the whole contrib dir, copy this rather than symlink incase the user is excluding docs
%__install -m 755 contrib/gitview/gitview %{buildroot}%{_bindir}
install -m 755 contrib/gitview/gitview %{buildroot}%{_bindir}
%__mkdir_p %{buildroot}%{_includedir}/git
%__cp *.h %{buildroot}%{_includedir}/git
mkdir -p %{buildroot}%{_includedir}/git
cp *.h %{buildroot}%{_includedir}/git
%__mkdir_p %{buildroot}%{_libdir}
%__install -m 644 libgit.a %{buildroot}%{_libdir}/libgit.a
mkdir -p %{buildroot}%{_libdir}
install -m 644 libgit.a %{buildroot}%{_libdir}/libgit.a
%__mv %{buildroot}/%{_prefix}/lib/perl5/site_perl %{buildroot}/%{_prefix}/lib/perl5/vendor_perl
%__rm -f %{buildroot}/%{perl_vendorlib}/Error.pm
mv %{buildroot}/%{_prefix}/lib/perl5/site_perl %{buildroot}/%{_prefix}/lib/perl5/vendor_perl
rm -f %{buildroot}/%{perl_vendorlib}/Error.pm
%__mkdir_p %{buildroot}%{_datadir}/gitweb/static
%__install -m 755 gitweb/gitweb.cgi %{buildroot}%{_datadir}/gitweb
%__install -m 644 gitweb/static/*.css gitweb/static/*.png %{buildroot}%{_datadir}/gitweb/static/
mkdir -p %{buildroot}%{_datadir}/gitweb/static
install -m 755 gitweb/gitweb.cgi %{buildroot}%{_datadir}/gitweb
install -m 644 gitweb/static/*.css gitweb/static/*.png %{buildroot}%{_datadir}/gitweb/static/
%__mkdir_p %{buildroot}%{_sysconfdir}
%__install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/gitweb.conf
mkdir -p %{buildroot}%{_sysconfdir}
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/gitweb.conf
# apache configuration
%__mkdir_p %{buildroot}%{_webappconfdir}
%__cat > %{buildroot}%{_webappconfdir}/gitweb.conf <<EOF
mkdir -p %{buildroot}%{_webappconfdir}
cat > %{buildroot}%{_webappconfdir}/gitweb.conf <<EOF
# gitweb configuration
Alias /gitweb %{_datadir}/gitweb
@ -239,19 +238,19 @@ EOF
find %{buildroot}/%{_mandir} -type f | xargs perl -e 's/\.sp$/\n\.sp/g' -pi
# emacs VC backend:
%__mkdir_p %{buildroot}{%{_datadir}/emacs/site-lisp,/etc/emacs/site-start.d}
%__install -m 644 contrib/emacs/*.el %{buildroot}%{_datadir}/emacs/site-lisp
%__cat >%{buildroot}/etc/emacs/site-start.d/vc_git.el <<EOF
mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp,/etc/emacs/site-start.d}
install -m 644 contrib/emacs/*.el %{buildroot}%{_datadir}/emacs/site-lisp
cat >%{buildroot}/etc/emacs/site-start.d/vc_git.el <<EOF
(add-to-list 'vc-handled-backends 'GIT)
EOF
# install bash-completion file
%__mkdir_p %{buildroot}%{_sysconfdir}/bash_completion.d
%__install -m644 contrib/completion/git-completion.bash \
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
install -m644 contrib/completion/git-completion.bash \
%{buildroot}%{_sysconfdir}/bash_completion.d/git
# And the prompt manipulation file
%__install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch}
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch}
# exposes a bug in less, as reported by coling
#install -D -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/profile.d/%{profile_env}
@ -264,8 +263,8 @@ LC_ALL=C %make %{git_make_params} test
# no file in the main package
%files -n git-core -f %{name}.lang
/etc/emacs/site-start.d/*
/etc/bash_completion.d/*
%{_sysconfdir}/emacs/site-start.d/*
%{_sysconfdir}/bash_completion.d/*
%{_datadir}/emacs/site-lisp/*
%{_bindir}/git
%{_bindir}/git-*
@ -308,7 +307,7 @@ LC_ALL=C %make %{git_make_params} test
%doc contrib/gitview/gitview.txt
%{_bindir}/gitview
%files -n %{libname}-devel
%files -n %{devname}
%{_includedir}/git
%{_libdir}/libgit.a