rpms/g-wrap/F-7 .cvsignore, 1.6, 1.7 g-wrap.spec, 1.38, 1.39 sources, 1.6, 1.7 g-wrap-consistent.patch, 1.1, NONE g-wrap-ffiexecstack.patch, 1.1, NONE g-wrap-glib2.patch, 1.2, NONE g-wrap-staticffi.patch, 1.2, NONE

Xavier LAMIEN (laxathom) fedora-extras-commits at redhat.com
Fri Aug 31 19:53:45 UTC 2007


Author: laxathom

Update of /cvs/pkgs/rpms/g-wrap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11100/F-7

Modified Files:
	.cvsignore g-wrap.spec sources 
Removed Files:
	g-wrap-consistent.patch g-wrap-ffiexecstack.patch 
	g-wrap-glib2.patch g-wrap-staticffi.patch 
Log Message:

Imported new source.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Feb 2006 19:13:29 -0000	1.6
+++ .cvsignore	31 Aug 2007 19:53:12 -0000	1.7
@@ -1,2 +1 @@
-g-wrap-1.9.6.tar.gz
-ia64.tar.gz
+g-wrap-1.9.9.tar.gz


Index: g-wrap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/F-7/g-wrap.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- g-wrap.spec	8 May 2007 01:52:58 -0000	1.38
+++ g-wrap.spec	31 Aug 2007 19:53:12 -0000	1.39
@@ -1,35 +1,39 @@
-Summary: A tool for creating Scheme interfaces to C libraries
-Name: g-wrap
-Version: 1.9.6
-Release: 11
-Group: Development/Libraries
-License: GPL
-Requires: guile
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://www.nongnu.org/g-wrap/
-Source: http://savannah.nongnu.org/download/g-wrap/g-wrap-%{version}.tar.gz
-Source1: ia64.tar.gz
-Patch0: g-wrap-info.patch
-Patch1: g-wrap-glib2.patch
-Patch2: g-wrap-staticffi.patch
-Patch3: g-wrap-ffiexecstack.patch
-Patch4: g-wrap-consistent.patch
-Patch5: g-wrap-1.9.6-shaddup.patch
-BuildRequires: guile-devel slib glib2-devel pkgconfig autoconf
+Name:            g-wrap
+Version:         1.9.9
+Release:         3%{?dist}
+Summary:         A tool for creating Scheme interfaces to C libraries
+
+Group:           Development/Libraries
+License:         LGPLv2+
+URL:             http://www.nongnu.org/g-wrap
+Source:          http://savannah.nongnu.org/download/g-wrap/%{name}-%{version}.tar.gz
+Patch0:          g-wrap-info.patch
+#Patch1:          g-wrap-ffiexecstack.patch
+Patch2:          g-wrap-1.9.6-shaddup.patch
+#Patch3:          g-wrap-1.9.8-staticffi.patch
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:   guile-devel, guile-lib
+BuildRequires:   slib, glib2-devel, pkgconfig, autoconf
+Requires:        guile, guile-lib
+
+Requires(post):  /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 This is a tool for specifying types, functions, and constants to
 import into a Scheme interpreter, and for generating code (in C) to
 interface these to the Guile and RScheme interpreters in particular.
 
-%package devel
-Summary: Include files and libraries needed for g-wrap development
-Group: Development/Libraries
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
-Requires: g-wrap = %{version}, guile-devel, pkgconfig
 
-%description devel
+%package         devel
+Summary:         Include files and libraries needed for g-wrap development
+Group:           Development/Libraries
+
+Requires:        %{name} = %{version}-%{release}
+Requires:        pkgconfig, guile-devel, automake
+
+%description     devel
 g-wrap-devel contains development libraries and headers for g-wrap.
 
 You can provide access to a given C API by creating a specification
@@ -40,77 +44,121 @@
 You should install g-wrap-devel if you need to compile programs that
 need to use g-wrap C<->Scheme functionality
 
+
 %prep
-%setup -q -a 1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%build
+%setup -q
 
-autoconf
+%patch0 -p1 -b .info
+#disabled as they don't work with g-wrap-1.9.8
+#%patch1 -p1
+%patch2 -p1 -b .shaddup
+# The following will remove libffi.so.4 which others need
+#%patch3 -p1
+
+
+%build
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --disable-static
+
+#remove Rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+#Is not parallel-build-safe
+make
+
+
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make INSTALL="install -p" install DESTDIR=%{buildroot}
+
+
+#Add missing ffi headers
+install -m 0644 libffi/fficonfig.h $RPM_BUILD_ROOT%{_includedir}
+install -m 0644 libffi/include/{ffi,ffitarget}.h $RPM_BUILD_ROOT%{_includedir}
+
+
+# remove libtool archive
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+#Remove unneeded file
+rm -f %{buildroot}%{_datadir}/info/dir
 
-# Move ffi headers out of standard locations to avoid apps picking
-# them up, and remove the .so. g-wrap headers are arch-dependent, so
-# move to $(libdir).
-
-mkdir -p %{buildroot}/%{_libdir}/g-wrap/include
-mv %{buildroot}/%{_includedir}/ffi* %{buildroot}/%{_libdir}/g-wrap/include
-mv %{buildroot}/%{_includedir}/g-wrap/ffi-support.h %{buildroot}/%{_libdir}/g-wrap/include/g-wrap-2.0-ffi-target.h
-
-cat > %{buildroot}/%{_includedir}/g-wrap/ffi-support.h << EOF
-/* Wrapper for target-specific ffi-support file. */
-#include <g-wrap-2.0-ffi-target.h>
-EOF
-
-rm -f %{buildroot}/%{_libdir}/libffi.*
-sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/*
-sed -i "s|<ffi|<g-wrap/ffi|g"  %{buildroot}/%{_includedir}/g-wrap/*.h
-rm -f %{buildroot}/%{_libdir}/*.a
-rm -f %{buildroot}/usr/share/info/dir
 
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
 
 %post devel
-/sbin/install-info --info-dir=%{_infodir} %{_infodir}/g-wrap.info.gz || :
+/sbin/install-info %{_infodir}/g-wrap.info.gz %{_infodir}/dir || :
+
 
 %postun -p /sbin/ldconfig
 
 %preun devel
 if [ "$1" = "0" ]; then
-    /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/g-wrap.info.gz || :
+    /sbin/install-info --delete %{_infodir}/g-wrap.info.gz %{_infodir}/dir || :
 fi
 
+
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README THANKS
+%doc AUTHORS COPYING.LIB ChangeLog NEWS README THANKS
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%{_libdir}/%{name}/modules/*.so.*
 %{_libdir}/*.so.*
-%{_libdir}/*.la
 %{_datadir}/guile/site/*
 
+
 %files devel
 %defattr(-,root,root)
 %{_bindir}/*
 %{_libdir}/*.so
-%{_libdir}/g-wrap
+%{_libdir}/%{name}/modules/libgw-guile-gw-glib.so
+%{_libdir}/%{name}/modules/libgw-guile-standard.so
 %{_includedir}/*
+%{_datadir}/aclocal/*
 %{_libdir}/pkgconfig/*
-%doc %{_infodir}/g-wrap.info*
+%doc %{_infodir}/g-wrap.*
+
+
 
 %changelog
+* Thu Aug 30 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-3
+- Fixed BR & Requires.
+- Moved *.m4 files to -devel package as its should.
+- Fixed ownership.
+
+* Sat Aug 25 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-2
+- Improved spec.
+- Removed all libtool archive.
+
+* Wed Aug 15 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-1
+- Updated Release.
+
+* Wed Aug 01 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.9-0.2.rc1
+- Fixed BR.
+- Fixed scriptlets.
+- Removed unneeded patchs.
+- Removed libgwrap*.la which're not needed anymore.
+
+* Tue Jul 31 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.9.9-0.1.rc1
+- minor fixes
+
+* Wed Jul 11 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.8-2
+- Added an g-wrap-staticffi patch that match with current release.
+
+* Tue Jul 10 2007 Xavier Lamien <lxtnow[at]gmail.com> - 1.9.8-1
+- Updated Release.
+- Added missing modules.
+- Kept libffi.la file.
+
+* Fri Jun  8 2007 Bill Nottingham <notting at redhat.com> - 1.9.6-12
+- fix license tag - LGPL, not GPL (#222347)
+
 * Mon May  7 2007 Bill Nottingham <notting at redhat.com> - 1.9.6-11
 - re-add .la files (#238263)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/g-wrap/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Feb 2006 19:13:29 -0000	1.6
+++ sources	31 Aug 2007 19:53:12 -0000	1.7
@@ -1,2 +1 @@
-4d83964f51376500eedced538c1620cb  g-wrap-1.9.6.tar.gz
-b5b26075d8bf6d6ef615334a45a7c806  ia64.tar.gz
+9014d7ed8d395ff335a6a4bf5778ed4e  g-wrap-1.9.9.tar.gz


--- g-wrap-consistent.patch DELETED ---


--- g-wrap-ffiexecstack.patch DELETED ---


--- g-wrap-glib2.patch DELETED ---


--- g-wrap-staticffi.patch DELETED ---




More information about the fedora-extras-commits mailing list