rpms/mugshot/F-7 mugshot.spec,1.15,1.16 sources,1.11,1.12

[Colin Walters (walters)]

Author: walters

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

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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mugshot.spec	13 Jul 2007 19:22:55 -0000	1.15
+++ mugshot.spec	2 Aug 2007 18:15:18 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           mugshot
-Version:        1.1.48
+Version:        1.1.49
 Release:        1%{?dist}
 Summary:        Companion software for mugshot.org
 
@@ -37,6 +37,7 @@
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  firefox-devel >= 1.5.0.4
 BuildRequires:  desktop-file-utils
+BuildRequires:  sqlite-devel >= 3.0.0
 
 # 1.0.3-3 has a backport from 1.0.4 to fix various segfaults
 Requires:       loudmouth >= 1.0.3-3
@@ -206,10 +207,15 @@
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/applications/mugshot.desktop
 %{_datadir}/gnome/autostart/mugshot.desktop
+%{_datadir}/gnome/autostart/mugshot-autostart.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
-* Fri Jul 13 2007 Owen Taylor <otaylor at redhat.com> - 1.1.48-1
+* Wed Aug 01 2007 Colin Walters <walters at redhat.com> - 1.1.49-1
+- 1.1.49
+- sqlite-devel
+
+* Tue Jul 24 2007 Colin Walters <walters at redhat.com> - 1.1.48-1
 - 1.1.48
 
 * Thu Jul 12 2007 Owen Taylor <otaylor at redhat.com> - 1.1.47-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mugshot/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Jul 2007 19:22:55 -0000	1.11
+++ sources	2 Aug 2007 18:15:18 -0000	1.12
@@ -1 +1 @@
-3b67ff79557ba00ab94a6ee7c19513c4  mugshot-1.1.48.tar.gz
+46bc6d088209ffbbd86b8beaa3e7b5a5  mugshot-1.1.49.tar.gz