From e21aea75770b4674983b6e58c90788f767133a06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 27 May 2011 07:36:47 +0000 Subject: [PATCH] - up to 1.7.5.3 Changed files: git-core-sysconfdir.patch -> 1.2 git-core.spec -> 1.245 --- git-core-sysconfdir.patch | 33 --------------------------------- git-core.spec | 5 +++-- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/git-core-sysconfdir.patch b/git-core-sysconfdir.patch index 469ba0a..2de02aa 100644 --- a/git-core-sysconfdir.patch +++ b/git-core-sysconfdir.patch @@ -1,36 +1,3 @@ -diff --git a/Makefile b/Makefile -index cbc3fce..f5a37b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -291,15 +291,8 @@ sharedir = $(prefix)/share - gitwebdir = $(sharedir)/gitweb - template_dir = share/git-core/templates - htmldir = share/doc/git-doc --ifeq ($(prefix),/usr) --sysconfdir = /etc - ETC_GITCONFIG = $(sysconfdir)/gitconfig - ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes --else --sysconfdir = $(prefix)/etc --ETC_GITCONFIG = etc/gitconfig --ETC_GITATTRIBUTES = etc/gitattributes --endif - lib = lib - # DESTDIR= - pathsep = : -@@ -1192,6 +1185,12 @@ endif - -include config.mak.autogen - -include config.mak - -+ifeq ($(prefix),/usr) -+sysconfdir ?= /etc -+else -+sysconfdir ?= etc -+endif -+ - ifdef CHECK_HEADER_DEPENDENCIES - COMPUTE_HEADER_DEPENDENCIES = - USE_COMPUTED_HEADER_DEPENDENCIES = diff --git a/config.mak.in b/config.mak.in index e378534..3006494 100644 --- a/config.mak.in diff --git a/git-core.spec b/git-core.spec index a6c689d..f2ba365 100644 --- a/git-core.spec +++ b/git-core.spec @@ -9,11 +9,11 @@ Summary: Distributed version control system focused on speed, effectivity and us Summary(pl.UTF-8): Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności Name: git-core Release: 1 -Version: 1.7.5.2 +Version: 1.7.5.3 License: GPL v2 Group: Development/Tools Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2 -# Source0-md5: f79ab8fe79b35346b499f131cbf381a4 +# Source0-md5: 5b5a5e6c1c5c05db6b8dd33e6f3acea4 Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}-gitweb-lighttpd.conf @@ -639,6 +639,7 @@ fi %lang(it) %{_datadir}/git-gui/lib/msgs/it.msg %lang(ja) %{_datadir}/git-gui/lib/msgs/ja.msg %lang(nb) %{_datadir}/git-gui/lib/msgs/nb.msg +%lang(pt_br) %{_datadir}/git-gui/lib/msgs/pt_br.msg %lang(ru) %{_datadir}/git-gui/lib/msgs/ru.msg %lang(sv) %{_datadir}/git-gui/lib/msgs/sv.msg %lang(zh_CN) %{_datadir}/git-gui/lib/msgs/zh_cn.msg -- 2.43.0