[packages/elektra] - up to 0.8.19 - removed obsolete configs and scripts - install needs fixing
baggins
baggins at pld-linux.org
Sun Jan 1 03:14:10 CET 2017
commit 27ae2dbf4e040fc3983f1a26ca5bf0d8c3de0646
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jan 1 11:13:34 2017 +0900
- up to 0.8.19
- removed obsolete configs and scripts
- install needs fixing
elektra-elektraenv.patch | 11 -----------
elektra.spec | 21 ++++-----------------
2 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/elektra.spec b/elektra.spec
index a8167ff..00dd6ad 100644
--- a/elektra.spec
+++ b/elektra.spec
@@ -12,13 +12,12 @@
Summary: A key/value pair database to store software configurations
Summary(pl.UTF-8): Baza kluczy/wartości do przechowywania konfiguracji oprogramowania
Name: elektra
-Version: 0.8.14
-Release: 2
+Version: 0.8.19
+Release: 1
License: BSD
Group: Applications/System
Source0: http://www.libelektra.org/ftp/elektra/releases/%{name}-%{version}.tar.gz
-# Source0-md5: a87cd3845e590bf413959dfd555e3704
-Patch0: %{name}-elektraenv.patch
+# Source0-md5: 6669e765c834e259fb7570f126b85d7e
Patch1: %{name}-no-markdown.patch
Patch2: %{name}-no-deb.patch
URL: http://www.libelektra.org/
@@ -345,7 +344,6 @@ Wiązanie Pythona 3 GI dla Elektry.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -364,13 +362,10 @@ cd build
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/sysconfig
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT/etc/profile.d/{kdb,kdb.sh}
-echo 'RUN="no"' > $RPM_BUILD_ROOT/etc/sysconfig/elektra
install -D src/plugins/xmltool/xmlschema/elektra.xsd $RPM_BUILD_ROOT%{_datadir}/sgml/elektra/elektra.xsd
%if %{with python2}
@@ -384,18 +379,12 @@ install -D src/plugins/xmltool/xmlschema/elektra.xsd $RPM_BUILD_ROOT%{_datadir}/
%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
%endif
-# "static" variant (with libelektra-static and thus all plugins linked in);
-# we don't need it
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/kdb-static
-
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/elektra/test_data
-
# prepare docs
%{__rm} -rf installed-doc
install -d installed-doc
%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name}-api installed-doc/elektra-api
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{README_md,doc_*_md,md_doc_*,md_src_*,src_plugins_*_md}.3elektra
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{README_md,doc_*_md,md_doc_*,md_src_*}.3elektra
%clean
rm -rf $RPM_BUILD_ROOT
@@ -493,8 +482,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/elektra/tool_exec/mount-spec
%attr(755,root,root) %{_libdir}/elektra/tool_exec/race
%attr(755,root,root) %{_libdir}/elektra/tool_exec/umount-all
-%attr(755,root,root) /etc/profile.d/kdb.sh
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/elektra
%{_datadir}/sgml/elektra
%{_mandir}/man1/kdb.1*
%{_mandir}/man1/kdb-check.1*
diff --git a/elektra-elektraenv.patch b/elektra-elektraenv.patch
deleted file mode 100644
index 471fef9..0000000
--- a/elektra-elektraenv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- elektra-0.7.0/scripts/elektraenv.sh.orig 2013-03-26 18:13:21.471056433 +0100
-+++ elektra-0.7.0/scripts/elektraenv.sh 2013-03-26 18:13:41.247722269 +0100
-@@ -34,6 +34,8 @@
- ##
- ###########################################################################
-
-+[ -s /etc/sysconfig/elektra ] && . /etc/sysconfig/elektra
-+[ x$RUN = xyes ] || return 0
-
- if [ -z "$KDB" ]; then
- KDB=kdb
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/elektra.git/commitdiff/27ae2dbf4e040fc3983f1a26ca5bf0d8c3de0646
More information about the pld-cvs-commit
mailing list