rpms/mojito/devel mojito.spec,1.9,1.10 import.log,1.1,NONE

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/mojito/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2883

Modified Files:
	mojito.spec 
Removed Files:
	import.log 
Log Message:
- Spec file cleanups


Index: mojito.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mojito/devel/mojito.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mojito.spec	5 Aug 2009 16:32:54 -0000	1.9
+++ mojito.spec	7 Aug 2009 11:58:44 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           mojito
 Version:        0.19.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A social network data aggregator
 
 Group:          Applications/Internet
@@ -15,7 +15,6 @@ BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: NetworkManager-glib-devel
-BuildRequires: pkgconfig
 BuildRequires: rest-devel
 BuildRequires: twitter-glib-devel
 BuildRequires: intltool
@@ -23,8 +22,6 @@ BuildRequires: gtk-doc
 
 # Require these because the git tarball doesn't have the configure built
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 %description
 Mojito is a social data server which will fetch data from the "social web", 
@@ -46,8 +43,11 @@ Files for development with %{name}.
 %setup -q
 chmod 644 examples/*.py 
 
-%build
+# Don't run configure from autogen.sh
+sed -i 's|echo|exit 0|g' autogen.sh
 ./autogen.sh
+
+%build
 %configure --enable-gtk-doc --with-gnome --with-online=networkmanager --disable-static --enable-lastfm-key --enable-myspace-key --enable-flickr-key
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -61,10 +61,8 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 #Remove libtool archives and static libs.
-rm -rf %{buildroot}/%{_libdir}/*.a
-rm -rf %{buildroot}/%{_libdir}/*.la
-rm -rf %{buildroot}/%{_libdir}/mojito/services/*.a
-rm -rf %{buildroot}/%{_libdir}/mojito/services/*.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %find_lang %{name}
 
@@ -103,6 +101,9 @@ rm -rf %{buildroot}
 %{_libdir}/libmojito-keystore.so
 
 %changelog
+* Wed Aug  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.2-2
+- A few minor spec file cleanups
+
 * Wed Aug  5 2009 Peter Robinson <pbrobinson at gmail.com> 0.19.2-1
 - Update to 0.19.2 - updated translations
 


--- import.log DELETED ---