diff options
| author | Todd Zullinger <tmz@pobox.com> | 2008-04-02 13:35:47 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2008-04-02 13:35:47 -0400 |
| commit | cae66d054c3bfcdf28177ececedb29d213a10640 (patch) | |
| tree | b5d3fd2515f44f59613404d736f394c633b2c415 | |
| parent | 5e5fab174ff96e3986519c12ba343fea5dd4cecd (diff) | |
| download | git-package-cae66d054c3bfcdf28177ececedb29d213a10640.tar.gz git-package-cae66d054c3bfcdf28177ececedb29d213a10640.tar.xz git-package-cae66d054c3bfcdf28177ececedb29d213a10640.zip | |
sync with cvs tag git-1_5_4_5-2_fc9
| -rw-r--r-- | git-gitweb-commitdiff.patch | 34 | ||||
| -rw-r--r-- | git.spec | 7 |
2 files changed, 4 insertions, 37 deletions
diff --git a/git-gitweb-commitdiff.patch b/git-gitweb-commitdiff.patch deleted file mode 100644 index 0dc90e9..0000000 --- a/git-gitweb-commitdiff.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit e62a641de17b172ffc4d3a803085c8afbfbec3d1 -Author: Florian La Roche <laroche@redhat.com> -Date: Sun Feb 3 12:38:46 2008 +0100 - - gitweb: Make feed entries point to commitdiff view - - Change feeds entries (feeds items) from pointing (linking) to 'commit' - view to pointing to 'commitdiff' view. - - First, feed entries have whatchanged-like list of files which were - modified in a commit, so 'commitdiff' view more naturally reflects - feed entry (is more naturally alternate / extended version of a feed - item). Second, this way the patches are shown directly and code review - is done more easily via watching feeds. - - [jn: Rewritten commit message] - - Signed-off-by: Florian La Roche <laroche@redhat.com> - Signed-off-by: Jakub Narebski <jnareb@gmail.com> - Signed-off-by: Junio C Hamano <gitster@pobox.com> - -diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl -index ae2d057..8ef2735 100755 ---- a/gitweb/gitweb.perl -+++ b/gitweb/gitweb.perl -@@ -5565,7 +5565,7 @@ XML - or next; - - # print element (entry, item) -- my $co_url = href(-full=>1, action=>"commit", hash=>$commit); -+ my $co_url = href(-full=>1, action=>"commitdiff", hash=>$commit); - if ($format eq 'rss') { - print "<item>\n" . - "<title>" . esc_html($co{'title'}) . "</title>\n" . @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.5.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -11,7 +11,6 @@ Source1: git-init.el Source2: git.xinetd Source3: git.conf.httpd Patch0: git-1.5-gitweb-home-link.patch -Patch1: git-gitweb-commitdiff.patch BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -129,7 +128,6 @@ Requires: git = %{version}-%{release}, emacs-common %prep %setup -q %patch0 -p1 -%patch1 -p1 %build make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ @@ -259,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Apr 02 2008 James Bowes <jbowes@redhat.com> 1.5.4.5-2 +- Remove a patch that's already upstream. + * Fri Mar 28 2008 James Bowes <jbowes@redhat.com> 1.5.4.5-1 - git-1.5.4.5 |