packages: ekg2/ekg2.spec - up to 20100825 - no longer need to remove .svn f...

[pawelz]

Author: pawelz                       Date: Wed Aug 25 09:56:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20100825
- no longer need to remove .svn folders from sources (fixed upstream)
- unified macro names (use %{subver})

---- Files affected:
packages/ekg2:
   ekg2.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.123 packages/ekg2/ekg2.spec:1.124
--- packages/ekg2/ekg2.spec:1.123	Mon Aug 16 23:33:53 2010
+++ packages/ekg2/ekg2.spec	Wed Aug 25 11:56:09 2010
@@ -23,9 +23,9 @@
 %bcond_with	svn			# checkout svn trunk instead of Source0 - requested by ekg2 developer
 
 %if %{with svn}
-%define		_snap svn.%(date +%Y%m%d)
+%define		subver svn.%(date +%Y%m%d)
 %else
-%define		_snap 20100816
+%define		subver 20100825
 %endif
 
 %define		rel 1
@@ -42,13 +42,13 @@
 Summary(pl.UTF-8):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
 Version:	0.3
-Release:	0.%{_snap}.%{rel}
+Release:	0.%{subver}.%{rel}
 Epoch:		2
 License:	GPL v2+
 Group:		Applications/Communications
 %if %{without svn}
-Source0:	http://pl.ekg2.org/%{name}-%{_snap}.tar.bz2
-# Source0-md5:	1e494941aa4d8c6dddec64cbf632cd19
+Source0:	http://pl.ekg2.org/%{name}-%{subver}.tar.bz2
+# Source0-md5:	4aff4fd7a56fe86c92604cd393db37d2
 %endif
 Patch0:		%{name}-perl-install.patch
 Patch1:		%{name}-gtk.patch
@@ -78,9 +78,9 @@
 %{?with_readline:BuildRequires:	readline-devel}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	sed >= 4.0
-%{?with_svn:BuildRequires:	subversion}
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
+%{?with_svn:BuildRequires:	subversion}
 %{?with_xosd:BuildRequires:	xosd-devel}
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -339,8 +339,7 @@
 
 %prep
 %if %{without svn}
-%setup -q -n %{name}-%{_snap}
-find -type d -name .svn | xargs rm -rf .svn
+%setup -q -n %{name}-%{subver}
 %else
 %setup -qcT
 cd ..
@@ -556,6 +555,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2010/08/25 09:56:09  pawelz
+- up to 20100825
+- no longer need to remove .svn folders from sources (fixed upstream)
+- unified macro names (use %{subver})
+
 Revision 1.123  2010/08/16 21:33:53  pawelz
 - svn export instead of checkout in %prep if with svn
 
================================================================

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