packages: ekg2/ekg2.spec - ekg2 switched to git (with-svn changed to with-git)

pawelz pawelz at pld-linux.org
Sat Nov 27 22:58:39 CET 2010


Author: pawelz                       Date: Sat Nov 27 21:58:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ekg2 switched to git (with-svn changed to with-git)

---- Files affected:
packages/ekg2:
   ekg2.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.134 packages/ekg2/ekg2.spec:1.135
--- packages/ekg2/ekg2.spec:1.134	Sun Nov 21 01:08:44 2010
+++ packages/ekg2/ekg2.spec	Sat Nov 27 22:58:33 2010
@@ -20,10 +20,10 @@
 %bcond_with	sqlite			# build logsqlite plugin based on sqlite (conflicts with sqlite3)
 %bcond_without	sqlite3			# don't build logsqlite plugin based on sqlite3
 %bcond_without	xosd			# don't build xosd plugin
-%bcond_with	svn			# checkout svn trunk instead of Source0 - requested by ekg2 developer
+%bcond_with	git			# checkout svn trunk instead of Source0 - requested by ekg2 developer
 
-%if %{with svn}
-%define		subver svn.%(date +%Y%m%d)
+%if %{with git}
+%define		subver git.%(date +%Y%m%d)
 %else
 %define		subver 20101115
 %endif
@@ -42,7 +42,7 @@
 Epoch:		2
 License:	GPL v2+
 Group:		Applications/Communications
-%if %{without svn}
+%if %{without git}
 Source0:	http://pl.ekg2.org/%{name}-%{subver}.tar.bz2
 # Source0-md5:	9cc649a5de57fc58f197e987ee3c697a
 %endif
@@ -77,7 +77,7 @@
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
-%{?with_svn:BuildRequires:	subversion}
+%{?with_git:BuildRequires:	git-core}
 %{?with_xosd:BuildRequires:	xosd-devel}
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -335,21 +335,17 @@
 Wtyczka xosd dla ekg2.
 
 %prep
-%if %{without svn}
-%setup -q -n %{name}-%{subver}
-%else
-%setup -qcT
-cd ..
-repo="http://toxygen.net/svn/ekg2/trunk"
-svn -q export --force $repo %{name}-%{version}
-cd -
-v=$(LANG=C svn info $repo/INSTALL 2>/dev/null|sed -n 's/^Revision: \([0-9]\+\)$/\1/p')
-if [ "$v" ]; then
-    echo SVN-rev.$v
-    v="SVN rev.$v"
-    sed -i "s/AM_INIT_AUTOMAKE(ekg2, CVS)/AM_INIT_AUTOMAKE(ekg2, \"$v\")/" configure.ac
+%if %{with git}
+%setup -q -T -c -n %{name}-%{subver}
+repo="%ekg2repo"
+if [ "$repo" = "%%ekg2repo" ]; then
+repo="git://github.com/leafnode/ekg2.git"
 fi
-
+git init
+git fetch $repo master
+git checkout FETCH_HEAD
+%else
+%setup -q -n %{name}-%{subver}
 %endif
 
 %patch0 -p1
@@ -561,6 +557,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2010/11/27 21:58:33  pawelz
+- ekg2 switched to git (with-svn changed to with-git)
+
 Revision 1.134  2010/11/21 00:08:44  pawelz
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.134&r2=1.135&f=u



More information about the pld-cvs-commit mailing list