Automatic import for version 1.7.9

This commit is contained in:
Rosa 2012-02-01 17:20:12 +04:00
parent a706dc20e6
commit b5e169931d
5 changed files with 157 additions and 182 deletions

View file

@ -1,2 +1,2 @@
sources:
"git-1.7.6.tar.bz2": c519b0765c419c84b561bb4a2a86526b16d95cde
"git-1.7.9.tar.gz": ed51ef5ef250daaa6e98515cf2641820cd268d4c

0
93git-branch.sh Executable file → Normal file
View file

0
93git-env.sh Executable file → Normal file
View file

View file

@ -1,8 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBOB7dFyGugalF9Dw4RAhb4AJ9SZeQz2WMNfOPpRYzk7WKTBhCRQgCeMxIn
UGycKSoDJTmx74PPUfzgwQk=
=XIYD
-----END PGP SIGNATURE-----

325
git.spec
View file

@ -1,45 +1,38 @@
%define libname %mklibname git
%define profile_branch 93git-branch.sh
%define profile_env 93git-env.sh
%define libname %mklibname git
%define profile_branch 93git-branch.sh
%define profile_env 93git-env.sh
Name: git
Epoch: 1
Version: 1.7.9
# 1.7.8 still builds fine in 2010.2 so keep mkrel for backports sake
Release: %mkrel 1
Summary: Global Information Tracker
License: GPLv2
Group: Development/Other
Url: http://git-scm.com/
Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
Source2: gitweb.conf
Source3: %{profile_branch}
# Do we really need it? It's not used anyway
Source4: %{profile_env}
BuildRequires: asciidoc
BuildRequires: curl-devel
BuildRequires: expat-devel
BuildRequires: openssl-devel
BuildRequires: perl-CGI
BuildRequires: python-devel
BuildRequires: xmlto
BuildRequires: zlib-devel
BuildRequires: docbook-dtd45-xml
Name: git
Version: 1.7.6
Release: %mkrel 1
Epoch: 1
Summary: Global Information Tracker
License: GPLv2
Group: Development/Other
Url: http://git-scm.com/
Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
Source1: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2.sign
Source2: gitweb.conf
Source3: %{profile_branch}
Source4: %{profile_env}
BuildRequires: asciidoc
BuildRequires: curl-devel
BuildRequires: expat-devel
BuildRequires: openssl-devel
BuildRequires: perl-CGI
BuildRequires: python-devel
BuildRequires: xmlto
BuildRequires: zlib-devel
BuildRequires: docbook-dtd45-xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Obsoletes: linus-git < 1.5.4.3-2
Provides: linus-git
Requires: git-core = %{epoch}:%{version}
Requires: gitk = %{epoch}:%{version}
Requires: git-svn = %{epoch}:%{version}
Requires: git-email = %{epoch}:%{version}
Suggests: git-arch = %{epoch}:%{version}
Suggests: git-core-oldies = %{epoch}:%{version}
Suggests: git-cvs = %{epoch}:%{version}
Requires: git-core = %{EVRD}
Requires: gitk = %{EVRD}
Requires: git-svn = %{EVRD}
Requires: git-email = %{EVRD}
Suggests: git-arch = %{EVRD}
Suggests: git-core-oldies = %{EVRD}
Suggests: git-cvs = %{EVRD}
%description
This is a stupid (but extremely fast) directory content manager. It
@ -51,18 +44,17 @@ elsewhere for tools for ordinary humans layered on top of this.
This is a dummy package which brings in all subpackages.
%package -n git-core
Summary: Global Information Tracker
Group: Development/Other
Requires: diffutils
Requires: rsync
Requires: less
Requires: openssh-clients
Suggests: git-prompt
Conflicts: git < 4.3.20-15
Obsoletes: gitcompletion
Provides: gitcompletion
Summary: Global Information Tracker
Group: Development/Other
Requires: diffutils
Requires: rsync
Requires: less
Requires: openssh-clients
Suggests: git-prompt
Conflicts: git < 4.3.20-15
Obsoletes: gitcompletion
Provides: gitcompletion
%description -n git-core
This is a stupid (but extremely fast) directory content manager. It
@ -77,82 +69,85 @@ This are the core tools with minimal dependencies.
You may want to install subversion, cpsps and/or tla to import
repositories from other VCS.
%package -n gitk
Summary: Git revision tree visualiser
Group: Development/Other
Requires: git-core = %{epoch}:%{version}
Requires: tk >= 8.4
Requires: tcl >= 8.4
Summary: Git revision tree visualiser
Group: Development/Other
Requires: git-core = %{EVRD}
Requires: tk >= 8.4
Requires: tcl >= 8.4
%description -n gitk
Git revision tree visualiser.
%package -n gitview
Summary: Git graphical revision tree visualiser
Group: Development/Other
Requires: git-core = %{epoch}:%{version}
Requires: python-cairo
Requires: pygtk2.0
Requires: python-gtksourceview
Summary: Git graphical revision tree visualiser
Group: Development/Other
Requires: git-core = %{EVRD}
Requires: python-cairo
Requires: pygtk2.0
Requires: python-gtksourceview
%description -n gitview
Git graphical revision tree visualiser.
%package -n %libname-devel
Summary: Git development files
Group: Development/Other
Provides: git-devel = %version-%release
%package -n %{libname}-devel
Summary: Git development files
Group: Development/Other
Provides: git-devel = %{version}-%{release}
%description -n %libname-devel
%description -n %{libname}-devel
Development files for git.
%package -n git-svn
Summary: Git tools for importing Subversion repositories
Group: Development/Other
Requires: git-core = %{epoch}:%{version}-%{release}, subversion
Summary: Git tools for importing Subversion repositories
Group: Development/Other
Requires: git-core = %{EVRD}, subversion
Requires: perl-Git
Requires: perl-SVN
%description -n git-svn
Git tools for importing Subversion repositories.
%package -n git-cvs
Summary: Git tools for importing CVS repositories
Group: Development/Other
Requires: git-core = %{epoch}:%{version}-%{release}
Suggests: cvs, cvsps
Summary: Git tools for importing CVS repositories
Group: Development/Other
Requires: git-core = %{EVRD}
Suggests: cvs, cvsps
%description -n git-cvs
Git tools for importing CVS repositories.
%package -n git-arch
Summary: Git tools for importing Arch repositories
Group: Development/Other
Requires: git-core = %{epoch}:%{version}-%{release}
Summary: Git tools for importing Arch repositories
Group: Development/Other
Requires: git-core = %{EVRD}
Suggests: tla
%description -n git-arch
Git tools for importing Arch repositories.
%package -n git-email
Summary: Git tools for sending email
Group: Development/Other
Requires: git-core = %{epoch}:%{version}-%{release}
Summary: Git tools for sending email
Group: Development/Other
Requires: git-core = %{EVRD}
Suggests: perl-Authen-SASL
Suggests: perl-MIME-Base64
%description -n git-email
Git tools for sending email.
%package -n perl-Git
Summary: Perl interface to Git
Group: Development/Perl
Requires: git-core = %{epoch}:%{version}-%{release}
Summary: Perl interface to Git
Group: Development/Perl
Requires: git-core = %{EVRD}
%description -n perl-Git
Perl interface to Git
%package -n python-git
Summary: Python interface to Git
Group: Development/Python
Requires: git-core = %{epoch}:%{version}-%{release}
Summary: Python interface to Git
Group: Development/Python
Requires: git-core = %{EVRD}
%description -n python-git
Python interface to Git
@ -160,7 +155,7 @@ Python interface to Git
%package -n git-core-oldies
Summary: Git obsolete commands, bound to extinction
Group: Development/Other
Requires: git-core = %{epoch}:%{version}-%{release}
Requires: git-core = %{EVRD}
%description -n git-core-oldies
Git obsolete commands, bound to extinction
@ -168,21 +163,22 @@ Git obsolete commands, bound to extinction
%package -n gitweb
Summary: cgi-bin script for browse a git repository with web browser
Group: System/Servers
Requires: git-core = %{epoch}:%{version}-%{release}
Requires: git-core = %{EVRD}
%description -n gitweb
cgi-bin script for browse a git repository with web browser.
%package -n git-prompt
Summary: Shows the current git branch in your bash prompt
Group: Shells
Requires: git-core = %{epoch}:%{version}-%{release}
Requires: bash-completion
Summary: Shows the current git branch in your bash prompt
Group: Shells
Requires: git-core = %{EVRD}
Requires: bash-completion
%description -n git-prompt
Shows the current git branch in your bash prompt.
%prep
%setup -q -n git-%{version}
%setup -q
# remove borring file
rm -f Documentation/.gitignore
# prefix gitweb css/png files with /gitweb
@ -190,8 +186,8 @@ 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="$RPM_OPT_FLAGS" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1
%make %git_make_params all doc gitweb/gitweb.cgi
%define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1
%make %{git_make_params} all doc gitweb/gitweb.cgi
# Produce RelNotes.txt.gz
# sed trick changes "-x.y.z.txt" to "-x.y.z.0.txt" for ordering, then undoes it
@ -201,34 +197,34 @@ cd Documentation/RelNotes \
&& awk 'FNR == 1 { print "" } { print }' $relnotesls | gzip -9c >../RelNotes.txt.gz
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="$RPM_OPT_FLAGS"
make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=$RPM_BUILD_ROOT
%__rm -rf %{buildroot}
%__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
@ -244,43 +240,31 @@ 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}
%find_lang %{name}
%check
LC_ALL=C %make %git_make_params test
%clean
rm -rf $RPM_BUILD_ROOT
%post -n gitweb
%if %mdkversion < 201010
%_post_webapp
%endif
%postun -n gitweb
%if %mdkversion < 201010
%_postun_webapp
%endif
LC_ALL=C %make %{git_make_params} test
%files
# no file in the main package
%files -n git-core
%defattr(-,root,root,0755)
%files -n git-core -f %{name}.lang
/etc/emacs/site-start.d/*
/etc/bash_completion.d/*
%{_datadir}/emacs/site-lisp/*
@ -291,15 +275,14 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_libdir}/git-core/*cvs*
%exclude %{_libdir}/git-core/git-archimport
%exclude %{_libdir}/git-core/*email*
# %exclude %{_bindir}/git-merge-recursive-old
%{_datadir}/git-core
%{_datadir}/git-gui
# %exclude %{_datadir}/git-core/python
%{_mandir}/*/git-*
%{_mandir}/*/git.*
%{_mandir}/*/gitattributes*
%{_mandir}/*/gitignore*
%{_mandir}/*/gitmodules*
%{_mandir}/*/gitnamespaces*
%{_mandir}/*/gitcli*
%{_mandir}/*/githooks*
%{_mandir}/*/gitrepository*
@ -308,6 +291,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/gitdiffcore*
%{_mandir}/*/gitworkflows*
%{_mandir}/*/gitrevisions*
%{_mandir}/*/gitcredentials*
%exclude %{_mandir}/man1/*svn*.1*
%exclude %{_mandir}/man1/*cvs*.1*
%exclude %{_mandir}/man7/*cvs*.7*
@ -316,81 +300,80 @@ rm -rf $RPM_BUILD_ROOT
%doc README Documentation/*.html Documentation/howto Documentation/technical Documentation/RelNotes.txt.gz
%files -n gitk
%defattr(-,root,root,0755)
%doc README
%{_bindir}/gitk
%{_mandir}/*/gitk*
%{_datadir}/gitk
%doc README
%files -n gitview
%defattr(-,root,root,0755)
%doc contrib/gitview/gitview.txt
%{_bindir}/gitview
%files -n %{libname}-devel
%defattr(-,root,root,0755)
%{_includedir}/git
%{_libdir}/libgit.a
%files -n git-svn
%defattr(-,root,root)
%{_libdir}/git-core/*svn*
%{_mandir}/man1/*svn*.1*
# %doc Documentation/*svn*.txt
# %doc Documentation/*svn*.html
%files -n git-cvs
%defattr(-,root,root)
%{_libdir}/git-core/*cvs*
%{_mandir}/man1/*cvs*.1*
%{_mandir}/man7/*cvs*.7*
# %doc Documentation/*git-cvs*.txt
# %doc Documentation/*git-cvs*.html
%files -n git-arch
%defattr(-,root,root)
%{_libdir}/git-core/git-archimport
%{_mandir}/man1/git-archimport.1*
# %doc Documentation/git-archimport.txt
# %doc Documentation/git-archimport.html
%files -n git-email
%defattr(-,root,root)
%{_libdir}/git-core/*email*
%{_mandir}/man1/*email*.1*
# %doc Documentation/*email*.txt
# %doc Documentation/*email*.html
%files -n perl-Git
%defattr(-,root,root)
%{perl_vendorlib}/*
%{_mandir}/man3/*
# /usr/lib/perl5/site_perl/5.8.8/Git.pm
# /usr/local/share/man/man3/Git.3pm
%files -n python-git
%defattr(-,root,root)
%py_puresitedir/*
%{py_puresitedir}/*
%files -n git-core-oldies
%defattr(-,root,root,0755)
# %{_bindir}/git-merge-recursive-old
# %{_datadir}/git-core/python
%files -n gitweb
%defattr(-,root,root,0755)
%doc gitweb/INSTALL gitweb/README
%config(noreplace) %{_sysconfdir}/gitweb.conf
%config(noreplace) %{_webappconfdir}/gitweb.conf
%{_datadir}/gitweb
%{_mandir}/man1/gitweb.1*
%{_mandir}/man5/gitweb.conf.5*
%files -n git-prompt
%defattr(-,root,root,0755)
%{_sysconfdir}/profile.d/%{profile_branch}
%changelog
* Mon Jun 27 2011 Funda Wang <fwang@mandriva.org> 1:1.7.6-1mdv2011.0
* Sun Jan 29 2012 Andrey Bondrov <abondrov@mandriva.org> 1:1.7.9-1mdv2012.0
+ Revision: 769574
- New version 1.7.9, update file list
+ Oden Eriksson <oeriksson@mandriva.com>
- rebuilt for perl-5.14.2
* Fri Jan 20 2012 Matthew Dawkins <mattydaw@mandriva.org> 1:1.7.8.4-1
+ Revision: 762864
- replaced accidentally removed file
- new version 1.7.8.4
- some spec clean up
* Sun Dec 18 2011 Andrey Bondrov <abondrov@mandriva.org> 1:1.7.8-1
+ Revision: 743542
- New version 1.7.8, spec cleanup
* Fri Oct 28 2011 Andrey Bondrov <abondrov@mandriva.org> 1:1.7.7.1-1
+ Revision: 707723
- New version 1.7.7.1
* Mon Jun 27 2011 Funda Wang <fwang@mandriva.org> 1:1.7.6-1
+ Revision: 687409
- update to new version 1.7.6
@ -746,7 +729,7 @@ rm -rf $RPM_BUILD_ROOT
+ Revision: 274672
- Release 1.6.0
* Sun Aug 10 2008 Olivier Blin <oblin@mandriva.com> 1:1.5.6.5-2mdv2009.0
* Sun Aug 10 2008 Olivier Blin <blino@mandriva.org> 1:1.5.6.5-2mdv2009.0
+ Revision: 270238
- rebuild because some binary packages have been eaten by the BogeySystem
@ -804,10 +787,10 @@ rm -rf $RPM_BUILD_ROOT
+ Pixel <pixel@mandriva.com>
- rebuild for perl-5.10.0
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
* Mon Nov 19 2007 Olivier Blin <oblin@mandriva.com> 1.5.3.5-4mdv2008.1
* Mon Nov 19 2007 Olivier Blin <blino@mandriva.org> 1.5.3.5-4mdv2008.1
+ Revision: 110190
- do not require gitview (and thus pygtk2) in main package
@ -856,7 +839,7 @@ rm -rf $RPM_BUILD_ROOT
+ Revision: 37919
- 1.5.2.1
* Fri Jun 01 2007 Olivier Blin <oblin@mandriva.com> 1.5.2-3mdv2008.0
* Fri Jun 01 2007 Olivier Blin <blino@mandriva.org> 1.5.2-3mdv2008.0
+ Revision: 33693
- install css/png files in /var/www/gitweb (they were unusable in cgi-bin directory)
- pass prefix and CFLAGS to install/test rules (so that make does not rebuild all files)