rpms/gnome-bluetooth/F-7 gnome-bluetooth.spec,1.44,1.45
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Thu Jul 12 23:05:20 UTC 2007
- Previous message: rpms/kernel/F-7 linux-2.6-i386-hpet-check-if-the-counter-works.patch, NONE, 1.1 kernel-2.6.spec, 1.3279, 1.3280
- Next message: rpms/openarena/devel menudef.h, NONE, 1.1 .cvsignore, 1.2, 1.3 openarena.desktop, 1.1, 1.2 openarena.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/gnome-bluetooth/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21570
Modified Files:
gnome-bluetooth.spec
Log Message:
- Work-around python install problems
Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-7/gnome-bluetooth.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-bluetooth.spec 12 Jul 2007 20:11:10 -0000 1.44
+++ gnome-bluetooth.spec 12 Jul 2007 23:04:48 -0000 1.45
@@ -15,7 +15,7 @@
BuildRequires: libbtctl-devel >= 0.9.0
BuildRequires: gob2 openobex-devel >= 1.0.1
BuildRequires: pygtk2-devel python-devel
-BuildRequires: intltool automake libtool gettext
+BuildRequires: intltool automake gettext
Requires: %{name}-libs = %{version}-%{release}
Requires(pre): GConf2
Requires(post): GConf2
@@ -63,12 +63,17 @@
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
-./libtool --finish $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules
# we do not want .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libbluetooth.*a
+
+# Python's .m4 sucks
+if [ $RPM_BUILD_ROOT/usr/lib/ != $RPM_BUILD_ROOT%{_libdir}/ ] ; then
+ mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/
+ rmdir $RPM_BUILD_ROOT/usr/lib
+fi
+
%find_lang %{name}
%clean
@@ -123,6 +128,7 @@
%changelog
* Thu Jul 12 2007 - Bastien Nocera <bnocera at redhat.com> - 0.9.0-1
- Updated for 0.9.0
+- Work-around python installation
* Mon Apr 2 2007 Matthias Clasen <mclasen at redhat.com> - 0.8.0-4
- Remove unncessary gconfd killing from scripts (#224561)
- Previous message: rpms/kernel/F-7 linux-2.6-i386-hpet-check-if-the-counter-works.patch, NONE, 1.1 kernel-2.6.spec, 1.3279, 1.3280
- Next message: rpms/openarena/devel menudef.h, NONE, 1.1 .cvsignore, 1.2, 1.3 openarena.desktop, 1.1, 1.2 openarena.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list