rpms/gai/FC-3 gai-0.5.8-gcc4.patch, NONE, 1.1 gai-0.5.8-pkgconfig.patch, NONE, 1.1 gai-0.5.8-multilib.patch, 1.2, 1.3 gai.spec, 1.9, 1.10
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sat Jun 11 22:39:43 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/gai/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12097/FC-3
Modified Files:
gai-0.5.8-multilib.patch gai.spec
Added Files:
gai-0.5.8-gcc4.patch gai-0.5.8-pkgconfig.patch
Log Message:
Don't upgrade to 0.5.9 yet as it breaks Preferences+About dialogs here.
* Sun Jun 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-9
- Fix libdir and includedir in pkgconfig file.
- Disable ROX panel support explicitly.
- Install cleanly via DESTDIR.
gai-0.5.8-gcc4.patch:
--- NEW FILE gai-0.5.8-gcc4.patch ---
diff -Nur gai-0.5.8-orig/gai/gai-pref2.c gai-0.5.8/gai/gai-pref2.c
--- gai-0.5.8-orig/gai/gai-pref2.c 2004-09-12 10:17:58.000000000 +0200
+++ gai-0.5.8/gai/gai-pref2.c 2005-03-20 20:09:30.000000000 +0100
@@ -870,7 +870,7 @@
if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
- (GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0],
+ ((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0],
g_strdup(buff));
}
((int *)iw[i].result2)[0] = j;
diff -Nur gai-0.5.8-orig/gai/gai-pref.c gai-0.5.8/gai/gai-pref.c
--- gai-0.5.8-orig/gai/gai-pref.c 2004-03-18 08:56:35.000000000 +0100
+++ gai-0.5.8/gai/gai-pref.c 2005-03-20 20:08:27.000000000 +0100
@@ -967,8 +967,8 @@
if((unsigned char*)(((int *)iw[i].result)[0]) != NULL &&
(unsigned char*)(((int *)iw[i].default_val)[0]) != NULL)
- (unsigned char*)(((int *)iw[i].result)[0]) =
- (unsigned char*)(((int *)iw[i].default_val)[0]) = g_strdup(buff);
+ (((int *)iw[i].result)[0]) =
+ (((int *)iw[i].default_val)[0]) = (unsigned char*)g_strdup(buff);
//printf("%s\n",buff);
@@ -988,7 +988,7 @@
if(j == g_list_length((GList *)((int *)iw[i].result)[0])){
- (GList *)((int *)iw[i].result)[0] = g_list_append((GList *)((int *)iw[i].result)[0],
+ ((int *)iw[i].result)[0] = (GList *)g_list_append((GList *)((int *)iw[i].result)[0],
g_strdup(buff));
// printf("%s is a new entry\n",buff);
}
gai-0.5.8-pkgconfig.patch:
--- NEW FILE gai-0.5.8-pkgconfig.patch ---
diff -Nur gai-0.5.8-orig/gai.pc.in gai-0.5.8/gai.pc.in
--- gai-0.5.8-orig/gai.pc.in 2004-03-05 20:24:25.000000000 +0100
+++ gai-0.5.8/gai.pc.in 2005-06-12 00:25:18.000000000 +0200
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/gai
-includedir=${prefix}/include
+libdir=@libdir@
+includedir=${prefix}/include/gai
gnome=@gnome_installed@
gl=@gl_installed@
rox=@with_rox@
gai-0.5.8-multilib.patch:
Index: gai-0.5.8-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai-0.5.8-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gai-0.5.8-multilib.patch 20 Mar 2005 19:16:50 -0000 1.2
+++ gai-0.5.8-multilib.patch 11 Jun 2005 22:39:41 -0000 1.3
@@ -9,7 +9,7 @@
.PHONY: all install uninstall clean
-@@ -20,19 +21,19 @@
+@@ -20,20 +21,20 @@
install: libgai at LIB_END@
mkdir -p $(DESTDIR)$(PREFIX)/include/gai
cp gai.h $(DESTDIR)$(PREFIX)/include/gai/
@@ -39,13 +39,3 @@
clean:
rm -f *.o *~ *@LIB_END@
---- gai-0.5.8.old/gai.pc.in 2005-03-20 11:18:30.593311880 +0000
-+++ gai-0.5.8/gai.pc.in 2005-03-20 11:18:49.061504288 +0000
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib/gai
-+libdir=@libdir@/gai
- includedir=${prefix}/include
- gnome=@gnome_installed@
- gl=@gl_installed@
Index: gai.spec
===================================================================
RCS file: /cvs/extras/rpms/gai/FC-3/gai.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gai.spec 20 Mar 2005 19:16:50 -0000 1.9
+++ gai.spec 11 Jun 2005 22:39:41 -0000 1.10
@@ -1,13 +1,15 @@
Name: gai
Version: 0.5.8
-Release: 6
+Release: 9%{?dist}
Summary: Generic Applet Interface
Group: User Interface/Desktops
License: LGPL
URL: http://gai.sourceforge.net
-Source0: http://download.sf.net/gai/gai-0.5.8.tar.bz2
+Source0: http://download.sf.net/gai/gai-%{version}.tar.bz2
Patch0: gai-0.5.8-multilib.patch
+Patch1: gai-0.5.8-gcc4.patch
+Patch2: gai-0.5.8-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel, gtk2-devel >= 2.2, gnome-panel-devel
@@ -36,18 +38,20 @@
%prep
%setup -q
%patch0 -p1 -b .multilib
+%patch1 -p1 -b .gcc4
+%patch2 -p1 -b .pkgconfig
%build
%ifarch x86_64
export CFLAGS="-fPIC $RPM_OPT_FLAGS"
%endif
-%configure
+%configure --disable-rox
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall PREFIX=$RPM_BUILD_ROOT/%{_prefix}
+make DESTDIR=${RPM_BUILD_ROOT} install
%clean
rm -rf $RPM_BUILD_ROOT
@@ -63,11 +67,22 @@
%files devel
%defattr(-,root,root,-)
%doc docs/*
-%{_includedir}/gai/*
+%{_includedir}/gai/
%{_libdir}/pkgconfig/*
%{_libdir}/libgai.so
%changelog
+* Sun Jun 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-9
+- Fix libdir and includedir in pkgconfig file.
+- Disable ROX panel support explicitly.
+- Install cleanly via DESTDIR.
+
+* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-8
+- Include gai headers directory.
+
+* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.5.8-7
+- Fix lvalue assignment errors for GCC4.
+
* Sun Mar 20 2005 Fabrice Colin <fabrice.colin[AT]gmail.com> - 0.5.8-6
- Make gai.pc multilib friendly so that 'pkg-config --exists gai'
doesn't fail on x86_64.
More information about the fedora-extras-commits
mailing list