rpms/g-wrap/devel g-wrap-glib2.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 g-wrap.spec, 1.18, 1.19 sources, 1.4, 1.5 g-wrap-1.3.4-arch.patch, 1.1, NONE g-wrap.m4.diff, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Feb 19 05:45:46 UTC 2006
Author: notting
Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13441
Modified Files:
.cvsignore g-wrap.spec sources
Added Files:
g-wrap-glib2.patch
Removed Files:
g-wrap-1.3.4-arch.patch g-wrap.m4.diff
Log Message:
update to 1.9.6
g-wrap-glib2.patch:
configure | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE g-wrap-glib2.patch ---
--- g-wrap-1.9.6/configure.glib2 2006-02-18 15:10:25.000000000 -0500
+++ g-wrap-1.9.6/configure 2006-02-18 15:11:39.000000000 -0500
@@ -21699,8 +21699,8 @@
if test "x$ac_cv_env_GLIB_CFLAGS_set" = "xset"; then
pkg_cv_GLIB_CFLAGS=$ac_cv_env_GLIB_CFLAGS_value
elif test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null`
+ if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21718,8 +21718,8 @@
if test "x$ac_cv_env_GLIB_LIBS_set" = "xset"; then
pkg_cv_GLIB_LIBS=$ac_cv_env_GLIB_LIBS_value
elif test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null`
+ if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21731,7 +21731,7 @@
echo "${ECHO_T}$pkg_cv_GLIB_LIBS" >&6
if test $pkg_failed = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" 1>&5
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 9 Sep 2004 04:55:04 -0000 1.4
+++ .cvsignore 19 Feb 2006 05:45:44 -0000 1.5
@@ -1 +1 @@
-g-wrap-1.3.4.tar.gz
+g-wrap-1.9.6.tar.gz
Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- g-wrap.spec 11 Feb 2006 03:24:05 -0000 1.18
+++ g-wrap.spec 19 Feb 2006 05:45:44 -0000 1.19
@@ -1,7 +1,7 @@
Summary: A tool for creating Scheme interfaces to C libraries
Name: g-wrap
-Version: 1.3.4
-Release: 9.2.1
+Version: 1.9.6
+Release: 1
Group: Development/Libraries
License: GPL
Requires: guile
@@ -9,9 +9,8 @@
Prereq: /sbin/ldconfig
Source: ftp://ftp.gnucash.org/pub/g-wrap/g-wrap-%{version}.tar.gz
Patch0: g-wrap-info.patch
-Patch1: g-wrap-1.3.4-arch.patch
-Patch2: g-wrap.m4.diff
-BuildPrereq: guile-devel umb-scheme gtk+-devel
+Patch1: g-wrap-glib2.patch
+BuildPrereq: guile-devel slib glib-devel pkgconfig
%description
This is a tool for specifying types, functions, and constants to
@@ -22,7 +21,7 @@
Summary: Include files and libraries needed for g-wrap development.
Group: Development/Libraries
Prereq: /sbin/install-info
-Requires: g-wrap = %{version}, guile-devel
+Requires: g-wrap = %{version}, guile-devel, pkgconfig
%description devel
g-wrap-devel contains development libraries and headers for g-wrap.
@@ -38,26 +37,25 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p0
+#%patch1 -p1
%build
-#cp /usr/share/libtool/config.{sub,guess} .
-find . -name Makefile.in -exec sed -i 's|-Werror||g' {} \;
-%configure
+%configure --disable-static
make
-%ifnarch s390x ppc64 x86_64
-make check
-%endif
-
%install
rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=%{buildroot}
-/sbin/ldconfig -n %{buildroot}/usr/share/guile/g-wrapped
+# Move ffi headers out of standard locations to avoid apps picking
+# them up, and remove the .so.
+mv %{buildroot}/%{_includedir}/ffi* %{buildroot}/%{_includedir}/g-wrap
+rm -f %{buildroot}/%{_libdir}/libffi.{so,la}
+sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/*
+sed -i "s|<ffi|<g-wrap/ffi|g" %{buildroot}/%{_includedir}/g-wrap/*.h
+sed -i "s|%{_libdir}/libffi.la||g" %{buildroot}/%{_libdir}/*.la
rm -f %{buildroot}/usr/share/info/dir
%clean
@@ -82,19 +80,21 @@
%doc AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README THANKS
%{_libdir}/*.so.*
%{_libdir}/*.la
-%{_datadir}/guile/g-wrap
-%{_datadir}/guile/*.scm
+%{_datadir}/guile/site/*
%files devel
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/*.so
-%{_libdir}/*.a
%{_includedir}/*
-%{_datadir}/aclocal/g-wrap.m4
+%{_libdir}/pkgconfig/*
%doc %{_infodir}/g-wrap.info*
%changelog
+* Sat Feb 18 2006 Bill Nottingham <notting at redhat.com> 1.9.6-1
+- update to 1.9.6, to fix incompatiblity with gcc-4.x
+- disable static libs
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.4-9.2.1
- bump again for double-long bug on ppc(64)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 9 Sep 2004 04:55:04 -0000 1.4
+++ sources 19 Feb 2006 05:45:44 -0000 1.5
@@ -1 +1 @@
-bf29b8b563cc27d9f7fd90a6243653aa g-wrap-1.3.4.tar.gz
+4d83964f51376500eedced538c1620cb g-wrap-1.9.6.tar.gz
--- g-wrap-1.3.4-arch.patch DELETED ---
--- g-wrap.m4.diff DELETED ---
More information about the fedora-cvs-commits
mailing list