rpms/gai/FC-4 gai-0.5.8-pkgconfig.patch, NONE, 1.1 gai-0.5.8-multilib.patch, 1.2, 1.3 gai.spec, 1.11, 1.12
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sat Jun 11 22:39:44 UTC 2005
- Previous message (by thread): 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
- Next message (by thread): rpms/gai/devel gai-0.5.8-pkgconfig.patch, NONE, 1.1 gai-0.5.8-multilib.patch, 1.2, 1.3 gai.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/extras/rpms/gai/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12097/FC-4
Modified Files:
gai-0.5.8-multilib.patch gai.spec
Added Files:
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-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-4/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:18:40 -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-4/gai.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gai.spec 1 Apr 2005 14:11:56 -0000 1.11
+++ gai.spec 11 Jun 2005 22:39:41 -0000 1.12
@@ -1,14 +1,15 @@
Name: gai
Version: 0.5.8
-Release: 8
+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
@@ -38,18 +39,19 @@
%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
@@ -70,6 +72,11 @@
%{_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.
- Previous message (by thread): 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
- Next message (by thread): rpms/gai/devel gai-0.5.8-pkgconfig.patch, NONE, 1.1 gai-0.5.8-multilib.patch, 1.2, 1.3 gai.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list