mirror of
https://abf.rosa.ru/djam/git.git
synced 2025-02-23 09:43:00 +00:00
Minor spec cleanups
This commit is contained in:
parent
43b99726e9
commit
cf357491a2
1 changed files with 29 additions and 30 deletions
59
git.spec
59
git.spec
|
@ -1,4 +1,4 @@
|
||||||
%define libname %mklibname git
|
%define devname %mklibname git -d
|
||||||
%define profile_branch 93git-branch.sh
|
%define profile_branch 93git-branch.sh
|
||||||
%define profile_env 93git-env.sh
|
%define profile_env 93git-env.sh
|
||||||
|
|
||||||
|
@ -89,12 +89,12 @@ Requires: python-gtksourceview
|
||||||
%description -n gitview
|
%description -n gitview
|
||||||
Git graphical revision tree visualiser.
|
Git graphical revision tree visualiser.
|
||||||
|
|
||||||
%package -n %{libname}-devel
|
%package -n %{devname}
|
||||||
Summary: Git development files
|
Summary: Git development files
|
||||||
Group: Development/Other
|
Group: Development/Other
|
||||||
Provides: git-devel = %{version}-%{release}
|
Provides: git-devel = %{version}-%{release}
|
||||||
|
|
||||||
%description -n %{libname}-devel
|
%description -n %{devname}
|
||||||
Development files for git.
|
Development files for git.
|
||||||
|
|
||||||
%package -n git-svn
|
%package -n git-svn
|
||||||
|
@ -196,34 +196,33 @@ cd Documentation/RelNotes \
|
||||||
&& awk 'FNR == 1 { print "" } { print }' $relnotesls | gzip -9c >../RelNotes.txt.gz
|
&& awk 'FNR == 1 { print "" } { print }' $relnotesls | gzip -9c >../RelNotes.txt.gz
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%__rm -rf %{buildroot}
|
mkdir -p %{buildroot}%{_bindir}
|
||||||
%__mkdir_p %{buildroot}%{_bindir}
|
|
||||||
%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}"
|
%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}"
|
||||||
make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
|
make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
|
||||||
# (cg) Copy the whole contrib dir as docs. It contains useful scripts.
|
# (cg) Copy the whole contrib dir as docs. It contains useful scripts.
|
||||||
%__mkdir_p %{buildroot}%{_datadir}/doc/git-core
|
mkdir -p %{buildroot}%{_datadir}/doc/git-core
|
||||||
%__cp -ar contrib %{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
|
# (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
|
mkdir -p %{buildroot}%{_includedir}/git
|
||||||
%__cp *.h %{buildroot}%{_includedir}/git
|
cp *.h %{buildroot}%{_includedir}/git
|
||||||
|
|
||||||
%__mkdir_p %{buildroot}%{_libdir}
|
mkdir -p %{buildroot}%{_libdir}
|
||||||
%__install -m 644 libgit.a %{buildroot}%{_libdir}/libgit.a
|
install -m 644 libgit.a %{buildroot}%{_libdir}/libgit.a
|
||||||
|
|
||||||
%__mv %{buildroot}/%{_prefix}/lib/perl5/site_perl %{buildroot}/%{_prefix}/lib/perl5/vendor_perl
|
mv %{buildroot}/%{_prefix}/lib/perl5/site_perl %{buildroot}/%{_prefix}/lib/perl5/vendor_perl
|
||||||
%__rm -f %{buildroot}/%{perl_vendorlib}/Error.pm
|
rm -f %{buildroot}/%{perl_vendorlib}/Error.pm
|
||||||
|
|
||||||
%__mkdir_p %{buildroot}%{_datadir}/gitweb/static
|
mkdir -p %{buildroot}%{_datadir}/gitweb/static
|
||||||
%__install -m 755 gitweb/gitweb.cgi %{buildroot}%{_datadir}/gitweb
|
install -m 755 gitweb/gitweb.cgi %{buildroot}%{_datadir}/gitweb
|
||||||
%__install -m 644 gitweb/static/*.css gitweb/static/*.png %{buildroot}%{_datadir}/gitweb/static/
|
install -m 644 gitweb/static/*.css gitweb/static/*.png %{buildroot}%{_datadir}/gitweb/static/
|
||||||
|
|
||||||
%__mkdir_p %{buildroot}%{_sysconfdir}
|
mkdir -p %{buildroot}%{_sysconfdir}
|
||||||
%__install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/gitweb.conf
|
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/gitweb.conf
|
||||||
# apache configuration
|
# apache configuration
|
||||||
%__mkdir_p %{buildroot}%{_webappconfdir}
|
mkdir -p %{buildroot}%{_webappconfdir}
|
||||||
%__cat > %{buildroot}%{_webappconfdir}/gitweb.conf <<EOF
|
cat > %{buildroot}%{_webappconfdir}/gitweb.conf <<EOF
|
||||||
# gitweb configuration
|
# gitweb configuration
|
||||||
Alias /gitweb %{_datadir}/gitweb
|
Alias /gitweb %{_datadir}/gitweb
|
||||||
|
|
||||||
|
@ -239,19 +238,19 @@ EOF
|
||||||
find %{buildroot}/%{_mandir} -type f | xargs perl -e 's/\.sp$/\n\.sp/g' -pi
|
find %{buildroot}/%{_mandir} -type f | xargs perl -e 's/\.sp$/\n\.sp/g' -pi
|
||||||
|
|
||||||
# emacs VC backend:
|
# emacs VC backend:
|
||||||
%__mkdir_p %{buildroot}{%{_datadir}/emacs/site-lisp,/etc/emacs/site-start.d}
|
mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp,/etc/emacs/site-start.d}
|
||||||
%__install -m 644 contrib/emacs/*.el %{buildroot}%{_datadir}/emacs/site-lisp
|
install -m 644 contrib/emacs/*.el %{buildroot}%{_datadir}/emacs/site-lisp
|
||||||
%__cat >%{buildroot}/etc/emacs/site-start.d/vc_git.el <<EOF
|
cat >%{buildroot}/etc/emacs/site-start.d/vc_git.el <<EOF
|
||||||
(add-to-list 'vc-handled-backends 'GIT)
|
(add-to-list 'vc-handled-backends 'GIT)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# install bash-completion file
|
# install bash-completion file
|
||||||
%__mkdir_p %{buildroot}%{_sysconfdir}/bash_completion.d
|
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||||
%__install -m644 contrib/completion/git-completion.bash \
|
install -m644 contrib/completion/git-completion.bash \
|
||||||
%{buildroot}%{_sysconfdir}/bash_completion.d/git
|
%{buildroot}%{_sysconfdir}/bash_completion.d/git
|
||||||
|
|
||||||
# And the prompt manipulation file
|
# 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
|
# exposes a bug in less, as reported by coling
|
||||||
#install -D -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/profile.d/%{profile_env}
|
#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
|
# no file in the main package
|
||||||
|
|
||||||
%files -n git-core -f %{name}.lang
|
%files -n git-core -f %{name}.lang
|
||||||
/etc/emacs/site-start.d/*
|
%{_sysconfdir}/emacs/site-start.d/*
|
||||||
/etc/bash_completion.d/*
|
%{_sysconfdir}/bash_completion.d/*
|
||||||
%{_datadir}/emacs/site-lisp/*
|
%{_datadir}/emacs/site-lisp/*
|
||||||
%{_bindir}/git
|
%{_bindir}/git
|
||||||
%{_bindir}/git-*
|
%{_bindir}/git-*
|
||||||
|
@ -308,7 +307,7 @@ LC_ALL=C %make %{git_make_params} test
|
||||||
%doc contrib/gitview/gitview.txt
|
%doc contrib/gitview/gitview.txt
|
||||||
%{_bindir}/gitview
|
%{_bindir}/gitview
|
||||||
|
|
||||||
%files -n %{libname}-devel
|
%files -n %{devname}
|
||||||
%{_includedir}/git
|
%{_includedir}/git
|
||||||
%{_libdir}/libgit.a
|
%{_libdir}/libgit.a
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue