[dconf/f14/master] 0.5

[Matthias Clasen]

commit a8b06f731af4dccc24be176ebcd0d6964923ee9d
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 10 16:10:12 2010 -0400

    0.5

 dconf.spec |   28 +++++++++++++++++++++-------
 sources    |    2 +-
 2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/dconf.spec b/dconf.spec
index 914e193..8044dda 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -1,8 +1,8 @@
-%define glib2_version 2.25.11
+%define glib2_version 2.25.12
 
 Name:           dconf
-Version:        0.4.2
-Release:        1
+Version:        0.5
+Release:        2
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -16,13 +16,14 @@ Requires:       dbus
 
 BuildRequires:  gtk2-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  vala-devel
+BuildRequires:  vala-devel >= 0.9.4
 BuildRequires:  libgee-devel
-BuildRequires:  gobject-introspection-devel
+# BuildRequires:  gobject-introspection-devel
 # Bootstrap requirements
 BuildRequires:  autoconf automake libtool
 BuildRequires:  gtk-doc
 BuildRequires:  vala
+BuildRequires:  gobject-introspection-devel
 
 %description
 dconf is a low-level configuration system. Its main purpose is to provide a
@@ -60,8 +61,13 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-
-rm $RPM_BUILD_ROOT%{_libdir}/libdconf.la
+# fix up shared lib symlinks to ldconfigs liking
+(cd $RPM_BUILD_ROOT%{_libdir}
+ mv libdconf.so.0 libdconf.so.0.0.0
+ rm libdconf.so
+ ln -s libdconf.so.0.0.0 libdconf.so.0
+ ln -s libdconf.so.0.0.0 libdconf.so
+)
 
 %post
 /sbin/ldconfig
@@ -86,15 +92,23 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_includedir}/dconf
 %{_libdir}/libdconf.so
 %{_libdir}/pkgconfig/dconf.pc
+# temporarily disable introspection until we have a new-enough goi
 %{_libdir}/girepository-1.0/dconf-0.3.typelib
 %{_datadir}/gir-1.0/dconf-0.3.gir
 %{_datadir}/gtk-doc/html/dconf
+%{_datadir}/vala
 
 %files editor
 %defattr(-,root,root,-)
 %{_bindir}/dconf-editor
 
 %changelog
+* Thu Aug  5 2010 Matthias Clasen <mclasen at redhat.com> - 0.5-2
+- Fix up shared library symlinks (#621733)
+
+* Tue Aug  3 2010 Matthias Clasen <mclasen at redhat.com> - 0.5-1
+- Update to 0.5
+
 * Mon Jul 12 2010 Matthias Clasen <mclasen at redhat.com> - 0.4.2-1
 - Update to 0.4.2
 
diff --git a/sources b/sources
index ff515af..a500e1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-599bdaa3b91eff3a69c6307a39d9bc37  dconf-0.4.2.tar.bz2
+89065520d39b7e128d7e1471c66cf24b  dconf-0.5.tar.bz2