rpms/mugshot/F-7 mugshot.spec,1.18,1.19 sources,1.13,1.14

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/mugshot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30408

Modified Files:
	mugshot.spec sources 
Log Message:
merge from devel


Index: mugshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/mugshot.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mugshot.spec	4 Sep 2007 15:46:37 -0000	1.18
+++ mugshot.spec	11 Sep 2007 20:01:49 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.50
+Version:        1.1.52
 Release:        2%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -54,6 +54,13 @@
 a "live social experience" and interoperation with online services you and 
 your friends use. It's fun and easy.
 
+%package devel
+Summary: Development headers for Online Desktop
+Group: Development/Languages
+Requires: dbus-devel
+
+%description devel
+This package contains libraries for Online Desktop.
 
 %prep
 %setup -q
@@ -70,7 +77,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Don't package a .la file for the component .so
-rm -f $RPM_BUILD_ROOT%{_libdir}/mugshot/firefox/components/*.la
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Run desktop-file-install to so we get validation (and to make
 # things fedora-packaging-guidelines compliant)
@@ -204,12 +211,30 @@
 %{_datadir}/mugshot
 %ghost %{_datadir}/mugshot/version
 %{_libdir}/mugshot
+%{_libdir}/*.so.*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
+%files devel
+%dir %{_includedir}/ddm-1
+%{_includedir}/ddm-1/*
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+
 %changelog
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 1.1.52-2
+- shuffle .sos around (b.r.c 286371)
+- make devel package require dbus-devel
+
+* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 1.1.52-1
+- add devel pkg
+- 1.1.52
+
+* Thu Sep 06 2007 Colin Walters <walters at redhat.com> - 1.1.51-1
+- 1.1.51
+
 * Tue Sep  4 2007 Owen Taylor <otaylor at redhat.com> - 1.1.50-2
 - Don't put two autostart files in the autostart directory
   (https://bugzilla.redhat.com/show_bug.cgi?id=274921)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Aug 2007 20:32:18 -0000	1.13
+++ sources	11 Sep 2007 20:01:49 -0000	1.14
@@ -1 +1 @@
-d3c656d2d77da635fc73908c46fa960b  mugshot-1.1.50.tar.gz
+d675235775f6272a48734d64abd3e6af  mugshot-1.1.52.tar.gz