packages: gitolite/gitolite.spec - correct use of sed (-i!) - one more path...

pawelz pawelz at pld-linux.org
Mon Jun 7 15:16:30 CEST 2010


Author: pawelz                       Date: Mon Jun  7 13:16:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- correct use of sed (-i!)
- one more path to translate
- BR: sed >= 4.0

---- Files affected:
packages/gitolite:
   gitolite.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.3 packages/gitolite/gitolite.spec:1.4
--- packages/gitolite/gitolite.spec:1.3	Mon Jun  7 15:02:13 2010
+++ packages/gitolite/gitolite.spec	Mon Jun  7 15:16:25 2010
@@ -16,6 +16,7 @@
 URL:		http://github.com/sitaramc/gitolite
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	sed >= 4.0
 Requires:	git-core
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,8 +47,9 @@
 rm src/gl-system-install
 
 echo %{version} > conf/VERSION
-sed 's,^# $GL_PACKAGE_CONF =.*, $GL_PACKAGE_CONF = %{_sysconfdir}/gitolite,g' conf/example.gitolite.rc
-sed 's,^# $GL_PACKAGE_HOOKS =.*, $GL_PACKAGE_HOOKS = %{_datadir}/gitolite/hooks,g' conf/example.gitolite.rc
+sed -i 's,^GL_PACKAGE_CONF=.*,GL_PACKAGE_CONF=%{_sysconfdir}/gitolite,g' src/gl-setup
+sed -i 's,^# $GL_PACKAGE_CONF =.*, $GL_PACKAGE_CONF = %{_sysconfdir}/gitolite,g' conf/example.gitolite.rc
+sed -i 's,^# $GL_PACKAGE_HOOKS =.*, $GL_PACKAGE_HOOKS = %{_datadir}/gitolite/hooks,g' conf/example.gitolite.rc
 
 %build
 
@@ -79,6 +81,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/06/07 13:16:25  pawelz
+- correct use of sed (-i!)
+- one more path to translate
+- BR: sed >= 4.0
+
 Revision 1.3  2010/06/07 13:02:13  pawelz
 - lib.patch (thx sparky)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list