Author: pawelz Date: Sat Nov 27 22:40:04 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 20101127
---- Files affected:
packages/ekg2:
ekg2.spec (1.135 -> 1.136)
---- Diffs:
================================================================
Index: packages/ekg2/ekg2.spec
diff -u packages/ekg2/ekg2.spec:1.135 packages/ekg2/ekg2.spec:1.136
--- packages/ekg2/ekg2.spec:1.135 Sat Nov 27 22:58:33 2010
+++ packages/ekg2/ekg2.spec Sat Nov 27 23:39:59 2010
@@ -25,10 +25,10 @@
%if %{with git}
%define subver git.%(date +%Y%m%d)
%else
-%define subver 20101115
+%define subver 20101127
%endif
-%define rel 2
+%define rel 1
%if %{with sqlite}
%undefine sqlite3
@@ -43,8 +43,8 @@
License: GPL v2+
Group: Applications/Communications
%if %{without git}
-Source0: http://pl.ekg2.org/%{name}-%{subver}.tar.bz2
-# Source0-md5: 9cc649a5de57fc58f197e987ee3c697a
+Source0:
https://github.com/leafnode/ekg2/tarball/master#/%{name}-%{subver}.tar.bz2
+# Source0-md5: baec7f1165c9f98745ff544e66e98f3d
%endif
Patch0: %{name}-perl-install.patch
Patch1: %{name}-gtk.patch
@@ -58,6 +58,7 @@
%endif
BuildRequires: gettext-devel >= 0.17-8
%{?with_gadugadu:BuildRequires: giflib-devel}
+%{?with_git:BuildRequires: git-core}
%{?with_gnutls:BuildRequires: gnutls-devel >= 1.2.5}
%{?with_gpg:BuildRequires: gpgme-devel}
BuildRequires: gpm-devel
@@ -77,7 +78,6 @@
BuildRequires: sed >= 4.0
%{?with_sqlite:BuildRequires: sqlite-devel}
%{?with_sqlite3:BuildRequires: sqlite3-devel}
-%{?with_git:BuildRequires: git-core}
%{?with_xosd:BuildRequires: xosd-devel}
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -345,7 +345,8 @@
git fetch $repo master
git checkout FETCH_HEAD
%else
-%setup -q -n %{name}-%{subver}
+%setup -q -c -n %{name}-%{subver}
+mv leafnode-ekg2-*/* .
%endif
%patch0 -p1
@@ -396,8 +397,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f README README-main || true
-
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
%find_lang %{name}
@@ -407,7 +406,7 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc NEWS* README-main docs/ekg2book* docs/README docs/TODO docs/*.txt
+%doc NEWS* README.md docs/ekg2book* docs/README docs/TODO docs/*.txt
%attr(755,root,root) %{_bindir}/ekg2
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
@@ -443,6 +442,8 @@
%files plugin-gpg
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/gpg.so
+%{_datadir}/ekg2/plugins/gpg/commands-en.txt
+%{_datadir}/ekg2/plugins/gpg/commands-pl.txt
%endif
%if %{with gtk}
@@ -537,6 +538,8 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/plugins/python.so
%{_datadir}/%{name}/scripts/*.py
+%{_datadir}/ekg2/plugins/python/commands-en.txt
+%{_datadir}/ekg2/plugins/python/commands-pl.txt
%endif
%files plugin-sim
@@ -557,6 +560,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.136 2010/11/27 22:39:59 pawelz
+- up to 20101127
+
Revision 1.135 2010/11/27 21:58:33 pawelz
- ekg2 switched to git (with-svn changed to with-git)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekg2/ekg2.spec?r1=1.135&r2=1.136&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
