openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: git 1.7.11.1 -> 1.7.11.2

master
Dr. Ralf S. Engelschall 14 years ago
parent
544529a625
commit
be973cb548
2 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      git/git.patch
  2. 4
      git/git.spec

36
git/git.patch
Unescape View File

@ -37,9 +37,9 @@ Index: gc-utils/doc/Makefile
endif endif
uninstall: uninstall:
Index: git-1.7.11.1/Documentation/Makefile Index: git-1.7.11.2/Documentation/Makefile
--- git-1.7.11.1/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200 --- git-1.7.11.2/Documentation/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
+++ git-1.7.11.1/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200 +++ git-1.7.11.2/Documentation/Makefile 2012-06-18 16:02:16.000000000 +0200
@@ -56,10 +56,10 @@ @@ -56,10 +56,10 @@
infodir?=$(prefix)/share/info infodir?=$(prefix)/share/info
MAKEINFO=makeinfo MAKEINFO=makeinfo
@ -53,9 +53,9 @@ Index: git-1.7.11.1/Documentation/Makefile
endif endif
-include ../config.mak.autogen -include ../config.mak.autogen
Index: git-1.7.11.1/Makefile Index: git-1.7.11.2/Makefile
--- git-1.7.11.1/Makefile.orig 2012-06-18 00:01:30.000000000 +0200 --- git-1.7.11.2/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
+++ git-1.7.11.1/Makefile 2012-06-18 16:02:16.000000000 +0200 +++ git-1.7.11.2/Makefile 2012-06-18 16:02:16.000000000 +0200
@@ -339,12 +339,12 @@ @@ -339,12 +339,12 @@
bindir = $(prefix)/$(bindir_relative) bindir = $(prefix)/$(bindir_relative)
mandir = share/man mandir = share/man
@ -98,9 +98,9 @@ Index: git-1.7.11.1/Makefile
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' $(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
Index: git-1.7.11.1/config.mak.in Index: git-1.7.11.2/config.mak.in
--- git-1.7.11.1/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200 --- git-1.7.11.2/config.mak.in.orig 2012-06-18 00:01:30.000000000 +0200
+++ git-1.7.11.1/config.mak.in 2012-06-18 16:02:16.000000000 +0200 +++ git-1.7.11.2/config.mak.in 2012-06-18 16:02:16.000000000 +0200
@@ -15,9 +15,9 @@ @@ -15,9 +15,9 @@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
@ -113,9 +113,9 @@ Index: git-1.7.11.1/config.mak.in
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
mandir=@mandir@ mandir=@mandir@
Index: git-1.7.11.1/perl/Makefile.PL Index: git-1.7.11.2/perl/Makefile.PL
--- git-1.7.11.1/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200 --- git-1.7.11.2/perl/Makefile.PL.orig 2012-06-18 00:01:30.000000000 +0200
+++ git-1.7.11.1/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200 +++ git-1.7.11.2/perl/Makefile.PL 2012-06-18 16:02:16.000000000 +0200
@@ -55,5 +55,6 @@ @@ -55,5 +55,6 @@
PM => \%pm, PM => \%pm,
PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"], PM_FILTER => qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"],
@ -124,9 +124,9 @@ Index: git-1.7.11.1/perl/Makefile.PL
+ INSTALLDIRS => 'vendor', + INSTALLDIRS => 'vendor',
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3' + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
); );
Index: git-1.7.11.1/sha1_file.c Index: git-1.7.11.2/sha1_file.c
--- git-1.7.11.1/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200 --- git-1.7.11.2/sha1_file.c.orig 2012-06-18 00:01:30.000000000 +0200
+++ git-1.7.11.1/sha1_file.c 2012-06-18 16:32:16.000000000 +0200 +++ git-1.7.11.2/sha1_file.c 2012-06-18 16:32:16.000000000 +0200
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include "sha1-lookup.h" #include "sha1-lookup.h"
#include "bulk-checkin.h" #include "bulk-checkin.h"
@ -135,9 +135,9 @@ Index: git-1.7.11.1/sha1_file.c
#ifndef O_NOATIME #ifndef O_NOATIME
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
Index: git-1.7.11.1/templates/Makefile Index: git-1.7.11.2/templates/Makefile
--- git-1.7.11.1/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200 --- git-1.7.11.2/templates/Makefile.orig 2012-06-18 00:01:30.000000000 +0200
+++ git-1.7.11.1/templates/Makefile 2012-06-18 16:02:16.000000000 +0200 +++ git-1.7.11.2/templates/Makefile 2012-06-18 16:02:16.000000000 +0200
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
TAR ?= tar TAR ?= tar
RM ?= rm -f RM ?= rm -f

4
git/git.spec
Unescape View File

@ -22,7 +22,7 @@
## ##
# package version # package version
%define V_git 1.7.11.1 %define V_git 1.7.11.2
%define V_cogito 0.18.2 %define V_cogito 0.18.2
%define V_stgit 0.14.3 %define V_stgit 0.14.3
%define V_guilt 0.35 %define V_guilt 0.35
@ -40,7 +40,7 @@ Class: EVAL
Group: SCM Group: SCM
License: GPL License: GPL
Version: %{V_git} Version: %{V_git}
Release: 20120622 Release: 20120712
# package options # package options
%option with_doc no %option with_doc no

Write Preview
Loading…
Cancel
Save