devel/gai gai-0.5.8-multilib.patch,NONE,1.1 gai.spec,1.5,1.6

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/devel/gai
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6992

Modified Files:
	gai.spec 
Added Files:
	gai-0.5.8-multilib.patch 
Log Message:
fix compile on x86_64: add multilib patch and compile with fPIC

gai-0.5.8-multilib.patch:

--- NEW FILE gai-0.5.8-multilib.patch ---
diff -Naur gai-0.5.8.old/gai/Makefile.in gai-0.5.8/gai/Makefile.in
--- gai-0.5.8.old/gai/Makefile.in	2005-02-25 18:53:53.140784152 +0100
+++ gai-0.5.8/gai/Makefile.in	2005-02-25 18:56:33.644383896 +0100
@@ -9,6 +9,7 @@
 CC = @CC@
 OBJS = gai.o gai-debug.o gai-draw.o gai-info.o gai-transparent.o gai-pref2.o gai-gnome.o gai-dockapp.o gai-settings.o gai-pref.o @GNOME_CONFIG@ @ROX_OBJ@ gai-kde.o
 PREFIX = @prefix@
+libdir=@libdir@
 
 .PHONY: all install uninstall clean
 
@@ -20,19 +21,19 @@
 install: libgai at LIB_END@
 	mkdir -p $(DESTDIR)$(PREFIX)/include/gai
 	cp gai.h $(DESTDIR)$(PREFIX)/include/gai/
-	mkdir -p $(DESTDIR)$(PREFIX)/lib
-	cp libgai at LIB_END@ $(DESTDIR)$(PREFIX)/lib/libgai at LIB_START@. at GAI_MAJOR@. at GAI_MINOR@. at GAI_MICRO@@LIB_DARWIN@
-	ln -sf libgai at LIB_START@. at GAI_MAJOR@. at GAI_MINOR@. at GAI_MICRO@@LIB_DARWIN@ $(DESTDIR)$(PREFIX)/lib/libgai at LIB_START@. at GAI_MAJOR@@LIB_DARWIN@
-	ln -sf libgai at LIB_START@. at GAI_MAJOR@@LIB_DARWIN@ $(DESTDIR)$(PREFIX)/lib/libgai at LIB_END@
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig
-	cp ../gai.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/
+	mkdir -p $(DESTDIR)$(libdir)
+	cp libgai at LIB_END@ $(DESTDIR)$(libdir)/libgai at LIB_START@. at GAI_MAJOR@. at GAI_MINOR@. at GAI_MICRO@@LIB_DARWIN@
+	ln -sf libgai at LIB_START@. at GAI_MAJOR@. at GAI_MINOR@. at GAI_MICRO@@LIB_DARWIN@ $(DESTDIR)$(libdir)/libgai at LIB_START@. at GAI_MAJOR@@LIB_DARWIN@
+	ln -sf libgai at LIB_START@. at GAI_MAJOR@@LIB_DARWIN@ $(DESTDIR)$(libdir)/libgai at LIB_END@
+	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
+	cp ../gai.pc $(DESTDIR)$(libdir)/pkgconfig/
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/include/gai/gai.h
 	rmdir $(DESTDIR)$(PREFIX)/include/gai
-	rm -f $(DESTDIR)$(PREFIX)/lib/libgai at LIB_START@. at GAI_MAJOR@. at GAI_MINOR@. at GAI_MICRO@@LIB_DARWIN@
-	rm -f $(DESTDIR)$(PREFIX)/lib/libgai at LIB_START@. at GAI_MAJOR@@LIB_DARWIN@
-	rm -f $(DESTDIR)$(PREFIX)/lib/libgai at LIB_END@
-	rm -f $(DESTDIR)$(PREFIX)/lib/pkgconfig/gai.pc
+	rm -f $(DESTDIR)$(libdir)/libgai at LIB_START@. at GAI_MAJOR@. at GAI_MINOR@. at GAI_MICRO@@LIB_DARWIN@
+	rm -f $(DESTDIR)$(libdir)/libgai at LIB_START@. at GAI_MAJOR@@LIB_DARWIN@
+	rm -f $(DESTDIR)$(libdir)/libgai at LIB_END@
+	rm -f $(DESTDIR)$(libdir)/pkgconfig/gai.pc
 clean:
 	rm -f *.o *~ *@LIB_END@
 


Index: gai.spec
===================================================================
RCS file: /cvs/extras/devel/gai/gai.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gai.spec	27 Nov 2004 15:22:56 -0000	1.5
+++ gai.spec	25 Feb 2005 18:06:58 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gai
 Version:	0.5.8
-Release:	2
+Release:	3
 Epoch:		0
 Summary:	Generic Applet Interface
 
@@ -8,6 +8,7 @@
 License:	GPL
 URL:		http://gai.sourceforge.net
 Source0:	http://download.sf.net/gai/gai-0.5.8.tar.bz2
+Patch0:		gai-0.5.8-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel, gtk2-devel >= 0:2.2, gnome-panel-devel
@@ -33,8 +34,13 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 %build
+%ifarch x86_64
+export CFLAGS="-fPIC $RPM_OPT_FLAGS"
+%endif
+
 %configure
 make %{?_smp_mflags}
 
@@ -61,6 +67,10 @@
 %{_libdir}/libgai.so
 
 %changelog
+* Tue Feb 25 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.5.8-3
+- add multilib-patch
+- compile with -fPIC on x86_64
+
 * Mon Nov 22 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-2
 - s/gnome-panel/gnome-panel-devel/g for FC2.