[elektra] Re-enable kdb scriptlets.
Christopher Meng
cicku at fedoraproject.org
Tue Jan 21 07:10:45 UTC 2014
commit bc64dad5f1207cdad242acb0a01e11521d0667ad
Author: Christopher Meng <i at cicku.me>
Date: Tue Jan 21 15:10:30 2014 +0800
Re-enable kdb scriptlets.
elektra.spec | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/elektra.spec b/elektra.spec
index 7453295..81bf049 100644
--- a/elektra.spec
+++ b/elektra.spec
@@ -1,6 +1,6 @@
Name: elektra
Version: 0.8.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A key/value pair database to store software configurations
License: BSD
URL: http://www.libelektra.org/
@@ -10,7 +10,8 @@ Source0: http://www.libelektra.org/ftp/elektra/releases/elektra-%{version
#Patch2: elektra-cmake-module-path.patch
BuildRequires: boost-devel
BuildRequires: cmake
-BuildRequires: doxygen db4-devel
+BuildRequires: db4-devel
+BuildRequires: doxygen
BuildRequires: docbook-style-xsl
BuildRequires: gawk
BuildRequires: GConf2-devel
@@ -68,9 +69,6 @@ developing elektrified applications.
%prep
%setup -q
-#%patch0 -p1 -b .rename
-#%patch1 -p1 -b .local
-#%patch2 -p1 -b .module
%build
# In-source builds are not recommended currently.
@@ -99,6 +97,8 @@ rm -rf %{buildroot}%{_mandir}/man3/key*
rm -rf %{buildroot}%{_mandir}/man3/p*
find %{buildroot}%{_mandir} -name '_*.3.gz' -delete
rm -rf %{buildroot}%{_datadir}/html
+
+# Upstream mistake fixed but presented in released version.
mv %{buildroot}%{_libdir}/elektra/types.hpp %{buildroot}%{_includedir}/elektra/
%check
@@ -107,10 +107,11 @@ mv %{buildroot}%{_libdir}/elektra/types.hpp %{buildroot}%{_includedir}/elektra/
# 9 - test_types (Failed)
#cd build && make test
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
# Create basic key structure for apps
-#kdb set -t dir system/sw > /dev/null 2>&1
-#kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra-%{version}/elektra.xsd" > /dev/null 2>&1 || :
+kdb set -t dir system/sw > /dev/null 2>&1
+kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra/elektra.xsd" > /dev/null 2>&1 || :
%postun -p /sbin/ldconfig
@@ -124,7 +125,7 @@ mv %{buildroot}%{_libdir}/elektra/types.hpp %{buildroot}%{_includedir}/elektra/
%{_libdir}/libelektra-full.so.%{version}
# Do not use (noreplace) for this config file.
%config %{_sysconfdir}/profile.d/*.sh
-#%{_datadir}/sgml/elektra-%{version}/
+%{_datadir}/sgml/elektra/
%files devel
%doc doc/AUTHORS doc/CHANGES doc/DESIGN doc/SECURITY
@@ -137,6 +138,9 @@ mv %{buildroot}%{_libdir}/elektra/types.hpp %{buildroot}%{_includedir}/elektra/
%{_mandir}/man3/*
%changelog
+* Tue Jan 21 2014 Christopher Meng <rpm at cicku.me> - 0.8.4-4
+- Use kdb to setup the schemapath.
+
* Mon Jan 20 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.8.4-3
- track soname,pkgconfig files closer, so changes aren't a surprise
- -devel: own %%_libdir/cmake
@@ -249,4 +253,3 @@ mv %{buildroot}%{_libdir}/elektra/types.hpp %{buildroot}%{_includedir}/elektra/
* Fri Jun 02 2006 Avi Alkalay <avi at unix.sh> 0.6.3-1
- Initial packaging
-
More information about the scm-commits
mailing list