rpms/elektra/devel elektra.spec, 1.8, 1.9 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3

NicolasChauvet kwizart at fedoraproject.org
Thu Mar 5 09:19:26 UTC 2009 

Author: kwizart

Update of /cvs/pkgs/rpms/elektra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19228

Modified Files:
	elektra.spec sources .cvsignore 
Log Message:
- Update to 0.7.0



Index: elektra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/elektra/devel/elektra.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- elektra.spec	24 Feb 2009 14:24:21 -0000	1.8
+++ elektra.spec	5 Mar 2009 09:18:56 -0000	1.9
@@ -1,13 +1,11 @@
 Summary:       A key/value pair database to store software configurations
 Name:          elektra
-Version:       0.6.10
-Release:       9%{?dist}
+Version:       0.7.0
+Release:       1%{?dist}
 Group:         System Environment/Libraries
 License:       BSD
 URL:           http://www.libelektra.org
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:        elektra-0.6.10-nostart.patch
-Patch1:        elektra-0.6.10-open.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # doxygen: to build the API documentation
 # libxslt, docbook-style-xsl: to build man pages from docbook with xsltproc program
@@ -17,10 +15,15 @@
 # gawk is used in src/libelektra/exportobjects.sh
 BuildRequires: gawk
 # gettext-devel: for the autoconf ICONV macro only
+# GConf2-devel: for the testing GConf2 backend for Elektra
+BuildRequires: GConf2-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: libtool, gettext-devel
+%if 0%{?fedora} > 10
+BuildRequires: glibc-static
+%endif
 
 Requires(post): /sbin/ldconfig
-Requires(post):  /sbin/chkconfig
-Requires(preun): /sbin/chkconfig, /sbin/service
 
 
 %description
@@ -63,39 +66,49 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nostart
-%patch1 -p1 -b .open
+
+
 
 %build
-CFLAGS="%{optflags} -D_GNU_SOURCE"
-export CFLAGS
-CXXFLAGS="%{optflags} -D_GNU_SOURCE"
-export CXXFLAGS
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure \
      --includedir=%{_includedir}/elektra \
      --program-prefix=%{name}- \
      --disable-static \
      --disable-rpath \
      --with-ulibdir=%{_libdir} \
-     --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets
-make %{?_smp_mflags}
+     --with-docbook=%{_datadir}/sgml/docbook/xsl-stylesheets \
+     --with-kdbschemadir=%{_datadir}/sgml/%{name}-%{version} \
+     --enable-iconv
+
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # Not used for now
 # --disable-xmltest
 # --with-hlvl-backenddir
-# --with-kdbschemadir
 # --with-default-backend
 # --with-default-dbackend
+#     --enable-ini \
+#     --enable-berkeleydb \
+#     --enable-gconf \
+#     --enable-daemon \
+#     --enable-python
+
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
+find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
 
 # Remove statically linked kdb - lib
-rm $RPM_BUILD_ROOT%{_bindir}/elektra-kdb_static
-rm $RPM_BUILD_ROOT%{_libdir}/libelektra.a
+rm $RPM_BUILD_ROOT%{_bindir}/*_static
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # file in profile.d is sourced, remove shebang and execute bits,
 # while keeping timestamps
@@ -106,7 +119,7 @@
 rm __elektra-elektraenv_timestamp
 
 #Fix symlink should be relative - Be aware of SONAME changes!
-ln -fs ../libelektratools.so.1  $RPM_BUILD_ROOT%{_libdir}/elektra/libelektratools.so
+ln -fs ../libelektratools.so.2  $RPM_BUILD_ROOT%{_libdir}/elektra/libelektratools.so
 
 ## doc fixes
 rm -rf __doc __doc-devel
@@ -115,18 +128,19 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/elektra
 mkdir __doc-devel
 mv  $RPM_BUILD_ROOT%{_datadir}/doc/elektra-devel/* __doc-devel
+touch -r ChangeLog __doc-devel/api-html/*
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/elektra-devel
 
+
 ## man fixes (from program prefix)
 mv $RPM_BUILD_ROOT%{_mandir}/man5/elektra-elektra.5 $RPM_BUILD_ROOT%{_mandir}/man5/elektra.5
 mv $RPM_BUILD_ROOT%{_mandir}/man7/elektra-elektra.7 $RPM_BUILD_ROOT%{_mandir}/man7/elektra.7
 
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/init.d/elektra-kdbd $RPM_BUILD_ROOT%{_initrddir}
-rmdir $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
+# The init-script is disabled for now
+rm -rf $RPM_BUILD_ROOT/etc/init.d/elektra-kdbd
+#Own the directory where configuration will be stored.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kdb
 
-# for the socket and the pidfile
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/elektra-kdbd/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,19 +148,9 @@
 
 %post
 /sbin/ldconfig
-if [ "$1" -eq "1" ]; then
-  # Create basic key structure for apps
-  elektra-kdb set -t dir system/sw
-  elektra-kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra-0.1.1/elektra.xsd"
-fi
-
-/sbin/chkconfig --add elektra-kdbd
-
-%preun
-if [ $1 = 0 ]; then
-        /sbin/service elektra-kdbd stop >/dev/null 2>&1 || :
-        /sbin/chkconfig --del elektra-kdbd
-fi
+# Create basic key structure for apps
+elektra-kdb set -t dir system/sw > /dev/null 2>&1
+elektra-kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra-%{version}/elektra.xsd" > /dev/null 2>&1 || :
 
 %postun -p /sbin/ldconfig
 
@@ -155,11 +159,11 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README INSTALL
 %doc __doc/*
-%{_initrddir}/elektra-kdbd
+#{_initrddir}/elektra-kdbd
+%dir %{_sysconfdir}/kdb
 %{_bindir}/elektra-kdb
-%{_sbindir}/elektra-kdbd
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/elektra/*.la
+%{_bindir}/elektra-preload
+#{_sbindir}/elektra-kdbd
 %{_libdir}/elektra
 %{_libdir}/libelektra*.so.*
 # Do not use (noreplace) for this config file.
@@ -167,21 +171,25 @@
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %{_mandir}/man5/*
-%{_datadir}/sgml/
-%dir %{_localstatedir}/run/elektra-kdbd/
+%{_datadir}/sgml/elektra-%{version}/
+
 
 %files devel
 %defattr(-,root,root,-)
 %doc __doc-devel/*
-%{_includedir}/elektra
+%{_includedir}/elektra/
 %{_libdir}/libelektra.so
+%{_libdir}/libelektra-cpp.so
 %{_libdir}/libelektratools.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*
 
 
 
 %changelog
+* Thu Mar  5 2009 kwizart < kwizart at gmail.com > - 0.7.0-1
+- Update to 0.7.0
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.10-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/elektra/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Mar 2007 01:26:26 -0000	1.2
+++ sources	5 Mar 2009 09:18:56 -0000	1.3
@@ -1 +1 @@
-dc8b22ac8eddecd7d0b32d13fde4a2e0  elektra-0.6.10.tar.gz
+febdf1276bc7ba91636731f73a30f756  elektra-0.7.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/elektra/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Mar 2007 01:26:26 -0000	1.2
+++ .cvsignore	5 Mar 2009 09:18:56 -0000	1.3
@@ -1 +1 @@
-elektra-0.6.10.tar.gz
+elektra-0.7.0.tar.gz

More information about the fedora-extras-commits mailing list