rpms/online-desktop/F-7 online-desktop.spec, 1.6, 1.7 sources, 1.6, 1.7

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/online-desktop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17545

Modified Files:
	online-desktop.spec sources 
Log Message:
merge from devel


Index: online-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/online-desktop.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- online-desktop.spec	11 Sep 2007 20:03:55 -0000	1.6
+++ online-desktop.spec	20 Sep 2007 21:57:32 -0000	1.7
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           online-desktop
-Version:        0.2.12
+Version:        0.2.15
 Release:        1%{?dist}
 Summary:        Desktop built around web sites and online services
 
@@ -12,15 +12,19 @@
 #X-VCS:         svn:http://svn.mugshot.org/online-desktop/trunk
 Source0:        http://download.mugshot.org/online-desktop/sources/online-desktop-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildArch:	noarch
 Requires:	dbus-python
 Requires:	gnome-python2-gconf
 Requires:	bigboard >= 0.5.1
+Requires: devilspie
 
 BuildRequires:	intltool
 BuildRequires:	python-devel
 BuildRequires:  glib2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  nspr-devel
+BuildRequires:  nss-devel
+BuildRequires:  dbus-devel
+BuildRequires:  libpurple-devel
 
 %description
 
@@ -74,6 +78,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
 
 desktop-file-install --vendor="fedora"                  \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -85,19 +90,22 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/od-*
+%{_bindir}/*
 # not used yet
 %dir %{_datadir}/online-desktop
 %{_datadir}/online-desktop/*
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/gnome/*.session
+%{_libdir}/pidgin/*.so
+%{_datadir}/dbus-1/services/*.service
 %exclude %{_datadir}/icons/hicolor/*/apps/picasa.png
 %exclude %{_datadir}/icons/hicolor/*/apps/yahoo-mail.png
-%dir %{python_sitelib}/pyonlinedesktop
-%{python_sitelib}/pyonlinedesktop/*
-%dir %{python_sitelib}/ddm
-%{python_sitelib}/ddm/*
+%dir %{python_sitearch}/pyonlinedesktop
+%{python_sitearch}/pyonlinedesktop/*
+%dir %{python_sitearch}/ddm
+%{python_sitearch}/ddm/*
+%{python_sitearch}/*.so
 %doc COPYING README
 
 %files flickr
@@ -178,10 +186,23 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-* Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.11-1
+%changelog
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.15-1
 - new upstream
+- dbus service
+
+* Thu Sep 20 2007 Colin Walters <walters at redhat.com> - 0.2.14-1
+- new upstream
+- become an arch package since we have binaries
+- add some brs
+- use pythonsitearch
+
+* Wed Sep 12 2007 Colin Walters <walters at redhat.com> - 0.2.13-1
+- new upstream
+
+* Tue Sep 11 2007 Colin Walters <walters at redhat.com> - 0.2.12-2
+- require devilspie
 
-%changelog
 * Mon Sep 10 2007 Colin Walters <walters at redhat.com> - 0.2.12-1
 - new upstream
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/online-desktop/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Sep 2007 20:03:55 -0000	1.6
+++ sources	20 Sep 2007 21:57:32 -0000	1.7
@@ -1 +1 @@
-f5e615cc8b41223068f3d731f2a3a3a9  online-desktop-0.2.12.tar.gz
+97dab9c6a5dfcf7fb9f1b08079de2f18  online-desktop-0.2.15.tar.gz