From b5e169931dc040b2d3596b7730e70ae493882fc6 Mon Sep 17 00:00:00 2001 From: Rosa Date: Wed, 1 Feb 2012 17:20:12 +0400 Subject: [PATCH] Automatic import for version 1.7.9 --- .abf.yml | 2 +- 93git-branch.sh | 0 93git-env.sh | 0 git-1.7.6.tar.bz2.sign | 8 - git.spec | 329 +++++++++++++++++++---------------------- 5 files changed, 157 insertions(+), 182 deletions(-) mode change 100755 => 100644 93git-branch.sh mode change 100755 => 100644 93git-env.sh delete mode 100644 git-1.7.6.tar.bz2.sign diff --git a/.abf.yml b/.abf.yml index 149e468..264a5de 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "git-1.7.6.tar.bz2": c519b0765c419c84b561bb4a2a86526b16d95cde + "git-1.7.9.tar.gz": ed51ef5ef250daaa6e98515cf2641820cd268d4c diff --git a/93git-branch.sh b/93git-branch.sh old mode 100755 new mode 100644 diff --git a/93git-env.sh b/93git-env.sh old mode 100755 new mode 100644 diff --git a/git-1.7.6.tar.bz2.sign b/git-1.7.6.tar.bz2.sign deleted file mode 100644 index 21b822c..0000000 --- a/git-1.7.6.tar.bz2.sign +++ /dev/null @@ -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----- diff --git a/git.spec b/git.spec index 40ef764..d7e7f09 100644 --- a/git.spec +++ b/git.spec @@ -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 - -%description -n %libname-devel +%package -n %{libname}-devel +Summary: Git development files +Group: Development/Other +Provides: git-devel = %{version}-%{release} + +%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 < %{buildroot}%{_webappconfdir}/gitweb.conf <%{buildroot}/etc/emacs/site-start.d/vc_git.el <%{buildroot}/etc/emacs/site-start.d/vc_git.el < 1:1.7.6-1mdv2011.0 +* Sun Jan 29 2012 Andrey Bondrov 1:1.7.9-1mdv2012.0 ++ Revision: 769574 +- New version 1.7.9, update file list + + + Oden Eriksson + - rebuilt for perl-5.14.2 + +* Fri Jan 20 2012 Matthew Dawkins 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 1:1.7.8-1 ++ Revision: 743542 +- New version 1.7.8, spec cleanup + +* Fri Oct 28 2011 Andrey Bondrov 1:1.7.7.1-1 ++ Revision: 707723 +- New version 1.7.7.1 + +* Mon Jun 27 2011 Funda Wang 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 1:1.5.6.5-2mdv2009.0 +* Sun Aug 10 2008 Olivier Blin 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 - rebuild for perl-5.10.0 - + Olivier Blin + + Olivier Blin - restore BuildRoot -* Mon Nov 19 2007 Olivier Blin 1.5.3.5-4mdv2008.1 +* Mon Nov 19 2007 Olivier Blin 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 1.5.2-3mdv2008.0 +* Fri Jun 01 2007 Olivier Blin 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)