Author: arekm Date: Fri May 27 07:36:53 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.7.5.3
---- Files affected: packages/git-core: git-core-sysconfdir.patch (1.1 -> 1.2) , git-core.spec (1.244 -> 1.245) ---- Diffs: ================================================================ Index: packages/git-core/git-core-sysconfdir.patch diff -u packages/git-core/git-core-sysconfdir.patch:1.1 packages/git-core/git-core-sysconfdir.patch:1.2 --- packages/git-core/git-core-sysconfdir.patch:1.1 Fri Apr 29 15:50:37 2011 +++ packages/git-core/git-core-sysconfdir.patch Fri May 27 09:36:47 2011 @@ -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 ================================================================ Index: packages/git-core/git-core.spec diff -u packages/git-core/git-core.spec:1.244 packages/git-core/git-core.spec:1.245 --- packages/git-core/git-core.spec:1.244 Fri May 20 14:41:52 2011 +++ packages/git-core/git-core.spec Fri May 27 09:36:47 2011 @@ -10,11 +10,11 @@ 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 @@ -640,6 +640,7 @@ %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 @@ -704,6 +705,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.245 2011/05/27 07:36:47 arekm +- up to 1.7.5.3 + Revision 1.244 2011/05/20 12:41:52 draenog - up to 1.7.5.2 - remove patches for issues fixed upstream ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core-sysconfdir.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.244&r2=1.245&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
