rpms/empathy/devel empathy.spec,1.5,1.6

Peter Gordon (pgordon) fedora-extras-commits at redhat.com
Fri Aug 31 17:20:44 UTC 2007


Author: pgordon

Update of /cvs/extras/rpms/empathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24710/devel

Modified Files:
	empathy.spec 
Log Message:
Add ldconfig invocations to %post and %postun scriptlets; add %defattr line to -devel subpackage.


Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- empathy.spec	31 Aug 2007 14:07:59 -0000	1.5
+++ empathy.spec	31 Aug 2007 17:20:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		empathy
 Version:	0.12
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
@@ -36,18 +36,18 @@
 client using Telepathy
 
 
-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+%package	devel
+Summary:	Development files for %{name}
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 ## Needs these for the various #include directives in its headers, as well
 ## as pkgconfig dependencies...
 Requires:	glib2-devel
 Requires:	telepathy-mission-control-devel
 Requires:	libxml2-devel
 
-%description    devel
+%description	devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
@@ -55,27 +55,31 @@
 %prep
 %setup -q
 
+
 %build
-%configure
+## FIXME: The python bindings have broken install scripts (calling
+## non-existent pyversions utility). 
+%configure --enable-python=no
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
-
 # remove --no-connect from the .desktop file
 # without this empathy won't launch from the menu
 sed -i 's/--no-connect//' \
 $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/%{name}.desktop
-
 desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/%{name}.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -83,7 +87,9 @@
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 fi
 
+
 %post
+/sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
@@ -93,6 +99,7 @@
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -100,13 +107,16 @@
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 fi
 
+
 %postun
+/sbin/ldconfig
 scrollkeeper-update -q || :
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
@@ -124,6 +134,7 @@
 %{_libdir}/libempathy*.so.*
 
 %files	devel
+%defattr(-,root,root,-)
 %doc COPYING
 %{_includedir}/libempathy*/
 %{_libdir}/libempathy*.so
@@ -132,6 +143,9 @@
 
 
 %changelog
+* Fri Aug 31 2007 Peter Gordon <peter at thecodergeek.com> - 0.12-2
+- Add ldconfig invocations to %%post and %%postun scriptlets.
+
 * Fri Aug 31 2007 Peter Gordon <peter at thecodergeek.com> - 0.12-1
 - Update to new upstream release (0.12).
 - Build against new mission-control stack.




More information about the fedora-extras-commits mailing list